Changeset 900 in MondoRescue for trunk/mondo/src/test

Timestamp:

Oct 24, 2006, 8:49:18 AM (18 years ago)

Author:

Bruno Cornec

Message:

Huge patch to introduce low level functions that will bw used everywhere (mr_free, mr_asprintf, ...)
Nearly linking now due to that.

Location:

trunk/mondo/src/test

Files:

• mktest (modified) (1 diff)
• test-conf.c (modified) (2 diffs)
• test-string.c (modified) (2 diffs)

trunk/mondo/src/test/mktest

@@ -7 +7 @@
 
 gcc -O2 -I../common -I../lib test-conf.c ../lib/mr_conf.c ../common/libmondo-msg.c -o test-conf
-gcc -O2 -I../common -I../lib test-string.c ../lib/mr_string.c -o test-string
+gcc -O2 -I../common -I../lib test-string.c ../lib/mr_str.c -o test-string
 
 for f in "test-conf"; do

trunk/mondo/src/test/test-conf.c

@@ -9 +9 @@
 #include "my-stuff.h"
 #include "mr_conf.h"
+#include "mr_mem.h"
 
 int g_main_pid = 0;
@@ -38 +39 @@
     }
     fprintf(stdout, "String : ***%s***\n",s);
-    paranoid_free(s);
+    mr_free(s);
     mr_conf_close();
     exit(0);

trunk/mondo/src/test/test-string.c

@@ -12 +12 @@
 
 #include "my-stuff.h"
-#include "mr_string.h"
+#include "mr_str.h"
+#include "mr_mem.h"
 
 main() {
@@ -21 +22 @@
     char *string = NULL;
 
-    asprintf(&string, "%s", "md0 : active raid10 hda1[0] hda12[3] hda6[2] hda5[1]\n");
+    mr_asprintf(&string, "%s", "md0 : active raid10 hda1[0] hda12[3] hda6[2] hda5[1]\n");
     fprintf(stdout, "string=|%s|\n", string);
     token = mr_strtok(string, delims, &lastpos);
     while (lastpos > 0) {
         fprintf(stdout, "token=|%s|, lastpos=%d\n", token, lastpos);
-        paranoid_free(token);
+        mr_free(token);
         token = mr_strtok(string, delims, &lastpos);
     }
-    paranoid_free(string);
+    mr_free(string);
     exit(0);
 }