Changes in util.c [34509d5:89f5338]

File:

• util.c (modified) (6 diffs)

util.c

@@ -446 +446 @@
 void *owl_malloc(size_t size)
 {
-  return(g_malloc(size));
+  return(malloc(size));
 }
 
 void owl_free(void *ptr)
 {
-  g_free(ptr);
+  free(ptr);
 }
 
 char *owl_strdup(const char *s1)
 {
-  return(g_strdup(s1));
+  return(strdup(s1));
 }
 
 void *owl_realloc(void *ptr, size_t size)
 {
-  return(g_realloc(ptr, size));
+  return(realloc(ptr, size));
 }
 
@@ -759 +759 @@
 char * owl_util_baseclass(char * class)
 {
-  char *ret;
   char *start, *end;
 
@@ -769 +768 @@
   start = owl_strdup(start);
   end = start + strlen(start) - 1;
-  while(*end == 'd' && *(end-1) == '.') {
+  while(end > start && *end == 'd' && *(end-1) == '.') {
     end -= 2;
   }
@@ -775 +774 @@
 
   return start;
+}
+
+char * owl_get_datadir() {
+    char * datadir = getenv("BARNOWL_DATA_DIR");
+    if(datadir != NULL)
+        return strchr(datadir, '=') + 1;
+    return DATADIR;
 }
 
@@ -789 +795 @@
   int numfailed=0;
 
-  printf("BEGIN testing owl_util\n");
+  printf("# BEGIN testing owl_util\n");
 
   FAIL_UNLESS("owl_util_substitute 1",
@@ -812 +818 @@
               !strcmp("meep foo bar", owl_util_uniq("meep foo", "bar foo meep", "-")));
 
-  if (numfailed) printf("*** WARNING: failures encountered with owl_util\n");
-  printf("END testing owl_util (%d failures)\n", numfailed);
+  // if (numfailed) printf("*** WARNING: failures encountered with owl_util\n");
+  printf("# END testing owl_util (%d failures)\n", numfailed);
   return(numfailed);
 }