Changeset 27784 for branches/czw_branch/20100427/ippTools/src/pxtools.c

Timestamp:

Apr 27, 2010, 11:50:36 AM (16 years ago)

Author:

watersc1

Message:

Moving code to a branch so I can work on the detectability server.

Location:

branches/czw_branch/20100427

Files:

• . (copied) (copied from trunk )
• ippTools/src/pxtools.c (modified) (1 diff)

branches/czw_branch/20100427/ippTools/src/pxtools.c

@@ -48 +48 @@
 }
 
+psString pxMergeCodeVersions(psString version1, psString version2) {
+  psString out = NULL;
+
+  bool mod1 = false;
+  bool mod2 = false;
+
+  psS32 num1;
+  psS32 num2;
+  psS32 numO;
+  
+  if (strchr(version1,'M')) {
+    psStringSubstitute(&version1,"M","");
+    mod1 = true;
+  }
+  if (strchr(version2,'M')) {
+    psStringSubstitute(&version2,"M","");
+    mod2 = true;
+  }
+
+  num1 = strtol(version1,NULL,10);
+  num2 = strtol(version2,NULL,10);
+
+  if (num1 >= num2) {
+    numO = num1;
+  }
+  else {
+    numO = num2;
+  }
+  
+  psStringAppend(&out,"%" PRId32,numO);
+  if (mod1 || mod2) {
+    psStringAppend(&out,"M");
+  }
+  return(out);
+}
+
+
+
 // 'scrubbed' is no longer a virtual state equivalent to cleaned, but allows files to be removed
 // even if the config files is missing.  This change was prompted as files that are cleaned can