Changeset 143 for trunk/src/reglookup.c

Timestamp:

02/12/09 22:24:27 (15 years ago)

Author:

tim

Message:

fixed a null pointer exception

removed some dependencies on less portable items

altered Makefiles to allow for MinGW cross compiling

File:

• trunk/src/reglookup.c (modified) (19 diffs)

trunk/src/reglookup.c

@@ -23 +23 @@
 
 #include <stdlib.h>
-#include <sysexits.h>
 #include <stdio.h>
 #include <string.h>
@@ -82 +81 @@
     quoted_name = malloc(1*sizeof(char));
     if(quoted_name == NULL)
-      bailOut(EX_OSERR, "ERROR: Could not allocate sufficient memory.\n");
+      bailOut(REGLOOKUP_EXIT_OSERR, "ERROR: Could not allocate sufficient memory.\n");
     quoted_name[0] = '\0';
   }
@@ -161 +160 @@
       copy = (char*)malloc((next-cur+1)*sizeof(char));
       if(copy == NULL)
-        bailOut(EX_OSERR, "ERROR: Memory allocation problem.\n");
+        bailOut(REGLOOKUP_EXIT_OSERR, "ERROR: Memory allocation problem.\n");
           
       memcpy(copy, cur, next-cur);
@@ -169 +168 @@
         ret_val[ret_cur] = NULL;
       else
-        bailOut(EX_DATAERR, "ERROR: Registry maximum depth exceeded.\n");
+        bailOut(REGLOOKUP_EXIT_DATAERR, "ERROR: Registry maximum depth exceeded.\n");
     }
     cur = next+1;
@@ -182 +181 @@
       ret_val[ret_cur] = NULL;
     else
-      bailOut(EX_DATAERR, "ERROR: Registry maximum depth exceeded.\n");
+      bailOut(REGLOOKUP_EXIT_DATAERR, "ERROR: Registry maximum depth exceeded.\n");
   }
 
@@ -384 +383 @@
 
   if(root == NULL)
-    bailOut(EX_DATAERR, "ERROR: root cannot be NULL.\n");
+    bailOut(REGLOOKUP_EXIT_DATAERR, "ERROR: root cannot be NULL.\n");
   
   do
@@ -392 +391 @@
       path = iter2Path(iter);
       if(path == NULL)
-        bailOut(EX_OSERR, "ERROR: Could not construct iterator's path.\n");
+        bailOut(REGLOOKUP_EXIT_OSERR, "ERROR: Could not construct iterator's path.\n");
 
       if(!type_filter_enabled || (key_type == type_filter))
@@ -410 +409 @@
         {
           printMsgs(iter->f);
-          bailOut(EX_DATAERR, "ERROR: could not traverse iterator upward.\n");
+          bailOut(REGLOOKUP_EXIT_DATAERR, "ERROR: could not traverse iterator upward.\n");
         }
 
@@ -417 +416 @@
         {
           printMsgs(iter->f);
-          bailOut(EX_DATAERR, "ERROR: unexpected NULL for key.\n");
+          bailOut(REGLOOKUP_EXIT_DATAERR, "ERROR: unexpected NULL for key.\n");
         }
 
@@ -431 +430 @@
       {
         printMsgs(iter->f);
-        bailOut(EX_DATAERR, "ERROR: could not traverse iterator downward.\n");
+        bailOut(REGLOOKUP_EXIT_DATAERR, "ERROR: could not traverse iterator downward.\n");
       }
 
@@ -507 +506 @@
 
     if((value == NULL) || (tmp_path_joined == NULL))
-      bailOut(EX_OSERR, "ERROR: Unexpected error before printValue.\n");
+      bailOut(REGLOOKUP_EXIT_OSERR, "ERROR: Unexpected error before printValue.\n");
 
     if(!type_filter_enabled || (value->type == type_filter))
@@ -525 +524 @@
     {
       printMsgs(iter->f);
-      bailOut(EX_DATAERR, "ERROR: Unexpected error on traversing path filter key.\n");
+      bailOut(REGLOOKUP_EXIT_DATAERR, "ERROR: Unexpected error on traversing path filter key.\n");
     }
 
@@ -568 +567 @@
   {
     usage();
-    bailOut(EX_USAGE, "ERROR: Requires at least one argument.\n");
+    bailOut(REGLOOKUP_EXIT_USAGE, "ERROR: Requires at least one argument.\n");
   }
   
@@ -579 +578 @@
       {
         usage();
-        bailOut(EX_USAGE, "ERROR: '-p' option requires parameter.\n");
+        bailOut(REGLOOKUP_EXIT_USAGE, "ERROR: '-p' option requires parameter.\n");
       }
       if((path_filter = strdup(argv[argi])) == NULL)
-        bailOut(EX_OSERR, "ERROR: Memory allocation problem.\n");
+        bailOut(REGLOOKUP_EXIT_OSERR, "ERROR: Memory allocation problem.\n");
 
       path_filter_enabled = true;
@@ -591 +590 @@
       {
         usage();
-        bailOut(EX_USAGE, "ERROR: '-t' option requires parameter.\n");
+        bailOut(REGLOOKUP_EXIT_USAGE, "ERROR: '-t' option requires parameter.\n");
       }
       if((type_filter = regfi_type_str2val(argv[argi])) < 0)
       {
         fprintf(stderr, "ERROR: Invalid type specified: %s.\n", argv[argi]);
-        bailOut(EX_USAGE, "");
+        bailOut(REGLOOKUP_EXIT_USAGE, "");
       }
       type_filter_enabled = true;
@@ -614 +613 @@
       usage();
       fprintf(stderr, "ERROR: Unrecognized option: %s\n", argv[argi]);
-      bailOut(EX_USAGE, "");
+      bailOut(REGLOOKUP_EXIT_USAGE, "");
     }
   }
   if((registry_file = strdup(argv[argi])) == NULL)
-    bailOut(EX_OSERR, "ERROR: Memory allocation problem.\n");
+    bailOut(REGLOOKUP_EXIT_OSERR, "ERROR: Memory allocation problem.\n");
 
   f = regfi_open(registry_file);
@@ -624 +623 @@
   {
     fprintf(stderr, "ERROR: Couldn't open registry file: %s\n", registry_file);
-    bailOut(EX_NOINPUT, "");
+    bailOut(REGLOOKUP_EXIT_NOINPUT, "");
   }
 
@@ -632 +631 @@
   iter = regfi_iterator_new(f);
   if(iter == NULL)
-    bailOut(EX_OSERR, "ERROR: Couldn't create registry iterator.\n");
+    bailOut(REGLOOKUP_EXIT_OSERR, "ERROR: Couldn't create registry iterator.\n");
 
   if(print_header)
@@ -659 +658 @@
       fprintf(stderr, "ERROR: retrievePath() returned %d.\n", 
               retr_path_ret);
-      bailOut(EX_DATAERR,"ERROR: Unknown error occurred in retrieving path.\n");
+      bailOut(REGLOOKUP_EXIT_DATAERR,
+              "ERROR: Unknown error occurred in retrieving path.\n");
     }
   }