Changeset 730 for trunk/dll/sortcnr.c

Timestamp:

Jul 22, 2007, 7:57:09 PM (18 years ago)

Author:

Gregg Young

Message:

Preliminary work on variable sized container buffers. Removes szFileName etc. Builds fine but traps.

File:

• trunk/dll/sortcnr.c (modified) (7 diffs)

trunk/dll/sortcnr.c

@@ -58 +58 @@
   if (SortFlags & SORT_NOSORT)
     return 0;
-  if (SortFlags && pCI1->szFileName[3] && pCI2->szFileName[3]) {
+  if (SortFlags && pCI1->pszFileName + 3 && pCI2->pszFileName + 3) {
     if (SortFlags & SORT_DIRSFIRST) {
       if ((pCI1->attrFile & FILE_DIRECTORY) !=
@@ -71 +71 @@
     switch (SortFlags & (~(SORT_DIRSFIRST | SORT_DIRSLAST | SORT_REVERSE))) {
     case SORT_SUBJECT:
-      if (*pCI1->szSubject && *pCI2->szSubject)
-        ret = stricmp(pCI1->szSubject, pCI2->szSubject);
+      if (*pCI1->pszSubject && *pCI2->pszSubject)
+        ret = stricmp(pCI1->pszSubject, pCI2->pszSubject);
       else {
-        ret = (*pCI2->szSubject) ? 1 : (*pCI1->szSubject) ? -1 : 0;
+        ret = (*pCI2->pszSubject) ? 1 : (*pCI1->pszSubject) ? -1 : 0;
         if (ret && (SortFlags & SORT_REVERSE))
           ret = (ret > 0) ? -1 : 1;
@@ -81 +81 @@
 
     case SORT_FILENAME:
-      pch1 = strrchr(pCI1->szFileName, '\\');
-      pch2 = strrchr(pCI2->szFileName, '\\');
+      pch1 = strrchr(pCI1->pszFileName, '\\');
+      pch2 = strrchr(pCI2->pszFileName, '\\');
       if (!pch1)
         pch1 = NullStr;
@@ -91 +91 @@
 
     case SORT_FIRSTEXTENSION:
-      pch1 = strrchr(pCI1->szFileName, '\\');
-      pch2 = strrchr(pCI2->szFileName, '\\');
+      pch1 = strrchr(pCI1->pszFileName, '\\');
+      pch2 = strrchr(pCI2->pszFileName, '\\');
       if (!pch1)
-        pch1 = pCI1->szFileName;
+        pch1 = pCI1->pszFileName;
       if (!pch2)
-        pch2 = pCI2->szFileName;
+        pch2 = pCI2->pszFileName;
       pch1 = strchr(pch1, '.');
       pch2 = strchr(pch2, '.');
@@ -107 +107 @@
 
     case SORT_LASTEXTENSION:
-      pch1 = strrchr(pCI1->szFileName, '\\');
-      pch2 = strrchr(pCI2->szFileName, '\\');
+      pch1 = strrchr(pCI1->pszFileName, '\\');
+      pch2 = strrchr(pCI2->pszFileName, '\\');
       if (!pch1)
-        pch1 = pCI1->szFileName;
+        pch1 = pCI1->pszFileName;
       if (!pch2)
-        pch2 = pCI2->szFileName;
+        pch2 = pCI2->pszFileName;
       pch1 = strrchr(pch1, '.');
       pch2 = strrchr(pch2, '.');
@@ -189 +189 @@
 
     if (!ret)
-      ret = (SHORT) stricmp(pCI1->szFileName, pCI2->szFileName);
+      ret = (SHORT) stricmp(pCI1->pszFileName, pCI2->pszFileName);
 
     if (ret && (SortFlags & SORT_REVERSE))
@@ -196 +196 @@
     return ret;
   }
-  return (SHORT) stricmp(pCI1->szFileName, pCI2->szFileName);
+  return (SHORT) stricmp(pCI1->pszFileName, pCI2->pszFileName);
 }