Changeset 118

Timestamp:

Dec 5, 2004, 1:12:55 AM (21 years ago)

Author:

root

Message:

Rework lstrip/rstrip usage
Rework fixup usage

File:

• trunk/dll/inis.c (modified) (11 diffs)

trunk/dll/inis.c

@@ +1 @@
+
+/***********************************************************************
+
+  $Id$
+
+  Copyright (c) 1993-98 M. Kimes
+  Copyright (c) 2004 Steven H.Levine
+
+  Revisions     01 Aug 04 SHL - Rework lstrip/rstrip usage
+                01 Aug 04 SHL - Rework fixup usage
+
+***********************************************************************/
+
 #define INCL_WIN
 #define INCL_GPI
@@ -664 +677 @@
                                 MPFROM2SHORT(sSelect,CCHMAXPATH),
                                 MPFROMP(s));
-              lstrip(rstrip(s));
+              bstrip(s);
               if(*s) {
                 fp = _fsopen(s,"r",SH_DENYWR);
@@ -692 +705 @@
                                 CCHMAXPATH,
                                 filename);
-            lstrip(rstrip(filename));
+            bstrip(filename);
             if(*filename) {
               p = strchr(filename,'.');
@@ -737 +750 @@
                                 MPFROM2SHORT(sSelect,CCHMAXPATH),
                                 MPFROMP(s));
-              lstrip(rstrip(s));
+              bstrip(s);
               if(*s) {
                 unlinkf(s);
@@ -847 +860 @@
                                 CCHMAXPATH,
                                 inirec->app2);
-            lstrip(rstrip(inirec->app2));
+            bstrip(inirec->app2);
             if(!*inirec->app2) {
               DosBeep(50,100);
@@ -857 +870 @@
                                   CCHMAXPATH,
                                   inirec->key2);
-              lstrip(rstrip(inirec->key2));
+              bstrip(inirec->key2);
               if(!*inirec->key2) {
                 DosBeep(50,100);
@@ -1360 +1373 @@
             if(p) {
               memset(p,0,inidata->datalen * 2);
-                fixup(inidata->data,p,inidata->datalen * 2,
-                      inidata->datalen);
+              fixup(inidata->data,
+                    p,
+                    inidata->datalen * 2,
+                    inidata->datalen);
               WinSetDlgItemText(hwnd,IAD_DATA,p);
               free(p);
@@ -1411 +1426 @@
             *applname = 0;
             WinQueryDlgItemText(hwnd,IAD_APPNAME,CCHMAXPATH,applname);
-            lstrip(rstrip(applname));
+            bstrip(applname);
             if(*applname) {
               *s = 0;
               WinQueryDlgItemText(hwnd,IAD_KEYNAME,CCHMAXPATH,s);
-              lstrip(rstrip(s));
+              bstrip(s);
               if(*s) {
                 appchanged = (BOOL)WinSendDlgItemMsg(hwnd,IAD_APPNAME,
@@ -1432 +1447 @@
                 *s = 0;
                 WinQueryDlgItemText(hwnd,IAD_DATA,CCHMAXPATH,s);
-                lstrip(rstrip(s));
+                bstrip(s);
                 WinEnableWindow(WinWindowFromID(hwnd,DID_OK),(*s != 0));
               }
@@ -1460 +1475 @@
             *applname = 0;
             WinQueryDlgItemText(hwnd,IAD_APPNAME,CCHMAXPATH,applname);
-            lstrip(rstrip(applname));
+            bstrip(applname);
             if(*applname) {
               *keyname = 0;
               WinQueryDlgItemText(hwnd,IAD_KEYNAME,CCHMAXPATH,keyname);
-              lstrip(rstrip(keyname));
+              bstrip(keyname);
               if(*keyname) {
                 *data = 0;
@@ -2449 +2464 @@
                              STR_FRAME,
                              &sip)) {
-                  if(!*rstrip(tofind)) {
+                  rstrip(tofind);
+                  if (!*tofind) {
                     DosBeep(50,100);
                     break;