Changeset 442 for trunk/dll/select.c

Timestamp:

Aug 24, 2006, 6:47:13 AM (19 years ago)

Author:

root

Message:

Rework SetMask args and logic

File:

• trunk/dll/select.c (modified) (8 diffs)

trunk/dll/select.c

@@ -15 +15 @@
   13 Jul 06 SHL Use Runtime_Error
   29 Jul 06 SHL Use xfgets_bstripcr
+  15 Aug 06 SHL Rework SetMask args and logic
 
 ***********************************************************************/
@@ -157 +158 @@
 }
 
-VOID SelectAll (HWND hwndCnr,BOOL files,BOOL dirs,CHAR *mask,
+VOID SelectAll (HWND hwndCnr,BOOL files,BOOL dirs,CHAR *maskstr,
                 CHAR *text,BOOL is_arc)
 {
@@ -171 +172 @@
     textlen = strlen(text);
   memset(&Mask,0,sizeof(Mask));
-  if (mask && *mask)
-    SetMask(mask,&Mask);
+  if (maskstr)
+    SetMask(maskstr,&Mask);
   pci = (PCNRITEM)WinSendMsg(hwndCnr,CM_QUERYRECORD,MPVOID,
                              MPFROM2SHORT(CMA_FIRST,CMA_ITEMORDER));
@@ -186 +187 @@
       else
         markit = TRUE;
-      if (mask && *mask && markit) {
+      if (maskstr && *maskstr && markit) {
         markit = FALSE;
         file = strrchr(pci->szFileName,'\\');
@@ -258 +259 @@
 }
 
-VOID DeselectAll (HWND hwndCnr,BOOL files,BOOL dirs,CHAR *mask,CHAR *text,
+VOID DeselectAll (HWND hwndCnr,BOOL files,BOOL dirs,CHAR *maskstr,CHAR *text,
                   BOOL is_arc)
 {
@@ -271 +272 @@
     textlen = strlen(text);
   memset(&Mask,0,sizeof(Mask));
-  if (mask && *mask)
-    SetMask(mask,&Mask);
+  if (maskstr && *maskstr)
+    SetMask(maskstr,&Mask);
   pci = (PCNRITEM)WinSendMsg(hwndCnr,CM_QUERYRECORD,MPVOID,
                              MPFROM2SHORT(CMA_FIRST,CMA_ITEMORDER));
@@ -286 +287 @@
       else
         unmarkit = TRUE;
-      if (mask && *mask && unmarkit) {
+      if (maskstr && *maskstr && unmarkit) {
         unmarkit = FALSE;
         file = strrchr(pci->szFileName,'\\');
@@ -490 +491 @@
 }
 
-VOID SetMask (CHAR *str,MASK *mask)
-{
-  register INT   x;
-  register CHAR *p;
-
-  if (str != mask->szMask)
-    strcpy(mask->szMask,str);
-  strcpy(mask->szMaskCopy,mask->szMask);
-  memset(mask->pszMasks,0,sizeof(CHAR *) * 26);
-  p = mask->pszMasks[0] = mask->szMaskCopy;
-  for (x = 1;x < 24;x++) {
+//== SetMask() Convert mask string to array of pointers to masks ==
+
+VOID SetMask (PSZ maskstr,MASK *mask)
+{
+  UINT x;
+  PSZ p;
+
+  if (maskstr)
+    strcpy(mask->szMask,maskstr);       // Got new mask string
+  // Build array of pointers
+  p = mask->szMaskCopy;
+  strcpy(p,mask->szMask);
+  // memset(mask->pszMasks,0,sizeof(mask->pszMasks);    // fixme to be gone
+  // Allow up to 25 masks - ignore extras
+  for (x = 0; *p && x < 25; x++) {
+    mask->pszMasks[x] = p;
     while (*p && *p != ';')
-     p++;
+      p++;                              // Find separator
     if (*p) {
-      *p = 0;
+      *p = 0;                           // Replace ;
       p++;
-      mask->pszMasks[x] = p;
-    }
-    else {
-      mask->pszMasks[x] = NULL;
-      break;
-    }
-  }
-  mask->pszMasks[x] = NULL;
+    }
+  } // for
+  mask->pszMasks[x] = NULL;             // Mark end
 }