[Xfce4-commits] <squeeze:master> Cleanup scanf-parser.c some more

[Stephan Arts]

Updating branch refs/heads/master
         to f8c2a32956ea2d195a4e53b07a002965f4a1350b (commit)
       from aab3b4e8d7e06ca64357cb927df63ab25d7a8bc6 (commit)

commit f8c2a32956ea2d195a4e53b07a002965f4a1350b
Author: Stephan Arts <stephan at xfce.org>
Date:   Tue Oct 4 22:11:57 2011 +0200

    Cleanup scanf-parser.c some more

 libsqueeze/scanf-parser.c |   83 ++++++++++++++++++++++++++++++++------------
 1 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/libsqueeze/scanf-parser.c b/libsqueeze/scanf-parser.c
index 5165b90..4dba106 100644
--- a/libsqueeze/scanf-parser.c
+++ b/libsqueeze/scanf-parser.c
@@ -399,27 +399,41 @@ skip_string (
     gchar *ptr;
     const gchar *delim;
 
-    if(!lng)
+    if ( 0 == lng )
+    {
         return 0;
+    }
 
     delim = part->delimiter;
-    if(!delim && !part->next)
+    if ( ( NULL == delim ) && ( NULL == part->next )
+    {
         delim = "\n";
+    }
 
-    if(!delim[0])
+
+    if ( '\0' == delim[0] )
+    {
         return 0;
+    }
 
     for(ptr = str; g_ascii_isspace(*ptr); ptr++);
 
-    ptr = g_strstr_len(ptr, lng, delim);
+    ptr = g_strstr_len ( ptr, lng, delim );
 
-    if(!ptr)
+    if ( NULL == ptr )
+    {
         return 0;
+    }
     
     return ptr - str;
 }
 
-static guint skip_unsigned(gchar *str, guint lng, parse_part *part, LSQScanfParserContext *ctx)
+static guint
+skip_unsigned (
+        gchar *str,
+        guint lng,
+        parse_part *part,
+        LSQScanfParserContext *ctx )
 {
     gchar *ptr;
 #ifdef DO_EXSTENSIVE_CHECKING
@@ -427,33 +441,48 @@ static guint skip_unsigned(gchar *str, guint lng, parse_part *part, LSQScanfPars
 #endif
     const gchar *delim;
 
-    if(!lng)
+    if ( 0 == lng )
+    {
         return 0;
+    }
 
     delim = part->delimiter;
-    if(!delim && !part->next)
+    if ( ( NULL == delim ) && ( NULL == part->next ) )
+    {
         delim = "\n";
+    }
 
-    if(!delim[0])
+    if ( '\0' == delim[0] )
     {
-        g_ascii_strtoull(str, &ptr, 10);
+        g_ascii_strtoull ( str, &ptr, 10);
         return ptr - str;
     }
 
-    ptr = g_strstr_len(str, lng, delim);
+    ptr = g_strstr_len ( str, lng, delim );
 
-    if(!ptr)
+    if ( NULL == ptr )
+    {
         return 0;
+    }
 #ifdef DO_EXSTENSIVE_CHECKING
-    g_ascii_strtoull(str, &ptr2, 10);
-    if(ptr > ptr2)
+
+    g_ascii_strtoull ( str, &ptr2, 10 );
+
+    if ( ptr > ptr2)
+    {
         return 0;
+    }
 #endif
     
     return ptr - str;
 }
 
-static guint skip_hexadecimal(gchar *str, guint lng, parse_part *part, LSQScanfParserContext *ctx)
+static guint
+skip_hexadecimal (
+        gchar *str,
+        guint lng,
+        parse_part *part,
+        LSQScanfParserContext *ctx )
 {
     gchar *ptr;
 #ifdef DO_EXSTENSIVE_CHECKING
@@ -461,27 +490,35 @@ static guint skip_hexadecimal(gchar *str, guint lng, parse_part *part, LSQScanfP
 #endif
     const gchar *delim;
 
-    if(!lng)
+    if ( 0 == lng )
+    {
         return 0;
+    }
 
     delim = part->delimiter;
-    if(!delim && !part->next)
+    if ( ( NULL == delim ) && ( NULL == part->next ) )
+    {
         delim = "\n";
+    }
 
-    if(!delim[0])
+    if ( '\0' == delim[0] )
     {
-        g_ascii_strtoll(str, &ptr, 0x10);
+        g_ascii_strtoll ( str, &ptr, 0x10 );
         return ptr - str;
     }
 
-    ptr = g_strstr_len(str, lng, delim);
+    ptr = g_strstr_len ( str, lng, delim );
 
-    if(!ptr)
+    if ( NULL == ptr )
+    {
         return 0;
+    }
 #ifdef DO_EXSTENSIVE_CHECKING
-    g_ascii_strtoll(str, &ptr2, 0x10);
-    if(ptr > ptr2)
+    g_ascii_strtoll ( str, &ptr2, 0x10 );
+    if ( ptr > ptr2 )
+    {
         return 0;
+    }
 #endif
     
     return ptr - str;