[PySoy-SVN] r1479 - trunk/concordance/src

[ArcRiley]

Author: ArcRiley
Date: 2009-01-13 23:40:19 -0500 (Tue, 13 Jan 2009)
New Revision: 1479

Modified:
   trunk/concordance/src/utils.c
Log:
formatting pickyness on last commit ;-)


Modified: trunk/concordance/src/utils.c
===================================================================
--- trunk/concordance/src/utils.c       2009-01-14 04:33:04 UTC (rev 1478)
+++ trunk/concordance/src/utils.c       2009-01-14 04:40:19 UTC (rev 1479)
@@ -140,11 +140,11 @@
     guint r = 0;
 
   /* return error now in case of empty string */
-  if (*string == '\0')
+  if (*string == 0)
     return FALSE;
  
   /* continue until hit end of string */
-  while (string[i] != '\0') {
+  while (string[i] != 0) {
     /* shift existing value up by 10, ie total input "92":
        i=0, r=0, r*10=0,  string[0] = "9", r =  0 + 9 =  9
        i=1, r=9, r*10=90, string[1] = "2", r = 90 + 2 = 92
@@ -158,7 +158,6 @@
        Returns -1 on error.
     */
     d = g_ascii_digit_value(string[i]);
-    printf("i = %i, d = %i\n", i, d);
     if (d == -1)
       return FALSE;
 
@@ -172,24 +171,31 @@
 
   /* pass r to the result pointer and return */
   *result = r;
-  printf("returning %i\n", r);
   return TRUE;
 }
 
+
 gchar* 
-conSession_getVersion(gchar * version,int * major, int * minor) {
-  //cdef :
-  gchar ** versions; 
-  if (g_strrstr(version,".")!=NULL) {
-    versions = g_strsplit(version,".",2); // Separate Major from minor
-    if (g_strv_length(versions) >= 2){  
-        printf("versions[0], %s, versions[1], %s\n",versions[0],versions[1]);
-        if (!concordStrToUI(versions[0], major))  {printf("Error on major\n"); 
return "version ='0.0'";}
-        if (!concordStrToUI(versions[1], minor))  {printf("Error on minor\n"); 
return "version ='0.0'";}
-        if ((*major) < 1) // Unsupported version
-          return "version='0.0'"; 
-        else if (((*major) == 1) && ((*minor) == 0))// Only 1.0 is supported 
-          return "version='1.0'";
+conSession_getVersion(gchar* version, gint* major, gint* minor) {         /*\
+  cdef :                                                                  \*/
+    gchar** versions;
+ 
+  if (g_strrstr(version, ".")!=NULL) {
+    versions = g_strsplit(version, ".", 2); // Separate Major from minor
+    if (g_strv_length(versions) >= 2) {  
+      printf("versions[0], %s, versions[1], %s\n", versions[0], versions[1]);
+      if (!concordStrToUI(versions[0], major)) {
+        printf("Error on major\n");
+        return "version ='0.0'";
+      }
+      if (!concordStrToUI(versions[1], minor)) {
+        printf("Error on minor\n");
+        return "version ='0.0'";
+      }
+      if ((*major) < 1) // Unsupported version
+        return "version='0.0'"; 
+      else if (((*major) == 1) && ((*minor) == 0)) // Only 1.0 is supported 
+        return "version='1.0'";
     }
   }
   // else (because it should have returned above)
@@ -197,5 +203,4 @@
   (*minor) = 0;
   g_strfreev(versions);
   return "version = '0.0'";
- 
 }

_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn