Changeset 388

Timestamp:

Jul 22, 2010, 2:48:11 PM (15 years ago)

Author:

pr

Message:

Replace #define with variable.

Files:

• branches/branch-1-0/src/helpers/tree.c (modified) (5 diffs)
• trunk/src/helpers/tree.c (modified) (1 diff)

branches/branch-1-0/src/helpers/tree.c

@@ -218 +218 @@
  +                         p,                   // new tree node
  +                         fnCompare);          // comparison func
- +              return (p);
+ +              return p;
  +          }
  *
@@ -226 +226 @@
  +          int TREEENTRY fnCompare(ULONG ul1, ULONG ul2)
  +          {
- +              return (strcmp((const char*)ul1,
- +                             (const char*)ul2));
+ +              return strcmp((const char*)ul1,
+ +                            (const char*)ul2);
  +          }
  *
@@ -332 +332 @@
 int TREEENTRY treeCompareStrings(unsigned long  ul1, unsigned long ul2)
 {
-    #define p1 (const char*)(ul1)
-    #define p2 (const char*)(ul2)
+    const char *p1 = (const char*) ul1;
+    const char *p2 = (const char*) ul2;
 
     if (p1 && p2)
@@ -760 +760 @@
         (*plCount)--;       // V0.9.16 (2001-10-19) [umoeller]
 
-    return (STATUS_OK);
+    return STATUS_OK;
 }
 
@@ -999 +999 @@
     }
 
-    return (papNodes);
+    return papNodes;
 }
 

trunk/src/helpers/tree.c

@@ -332 +332 @@
 int TREEENTRY treeCompareStrings(unsigned long  ul1, unsigned long ul2)
 {
-    #define p1 (const char*)(ul1)
-    #define p2 (const char*)(ul2)
+    const char *p1 = (const char*) ul1;
+    const char *p2 = (const char*) ul2;
 
     if (p1 && p2)