Changeset 768 in MondoRescue

Timestamp:

Aug 8, 2006, 3:51:12 PM (18 years ago)

Author:

Bruno Cornec

Message:

mktest generates again good results with the new split of libraries.

Location:

trunk/mondo/mondo

Files:

• common/libmondo-conf.c (deleted)
• common/libmondo-conf.h (deleted)
• common/libmondo-string.c (modified) (1 diff)
• lib/mr_conf.c (moved) (moved from trunk/mondo/mondo/lib/mrconf.c )
• lib/mr_conf.h (moved) (moved from trunk/mondo/mondo/lib/mrconf.h ) (1 diff)
• lib/mr_string.c (modified) (1 diff)
• lib/mr_string.h (added)
• test/mktest (modified) (1 diff)
• test/test-conf.c (modified) (3 diffs)
• test/test-string.c (modified) (1 diff)

trunk/mondo/mondo/common/libmondo-string.c

@@ -1138 +1138 @@
     return (type_of_backup);
 }
-
-
-/* New functions safe from a memory manageemnt point of view */
-/* Developped by Andree Leidenfrost */
-
-char *mr_strtok(char *instr, const char *delims, int *lastpos) {
-
-char *token = NULL;
-char *strptr = NULL;
-size_t pos1 = 0;
-size_t pos2 = 0;
-
-if (strlen(instr) <= *lastpos) {
-    *lastpos = 0;
-    return token;
-}
-
-strptr = instr + *lastpos;
-pos2 = strspn(strptr, delims);
-strptr += pos2;
-pos1 = strcspn(strptr, delims);
-token = malloc(sizeof(*token)*(pos1+1));
-strncpy(token, strptr, pos1);
-token[pos1] = '\0';
-*lastpos = *lastpos + pos1 + pos2 + 1;
-
-return token;
-}
-/* @} - end of stringGroup */

trunk/mondo/mondo/lib/mr_conf.h

@@ -6 +6 @@
  * Review for mondorescue (c) 2006 Bruno Cornec <bruno@mondorescue.org>
  *   
- *     Header file of libmondo-conf (mr_conf): a very small and simple
+ *     Header file of mr_conf: a very small and simple
  *     library for mondorescue configuration file reading
  *

trunk/mondo/mondo/lib/mr_string.c

@@ -2 +2 @@
    $Id$
 */
+
+#include <stdio.h>
+#include <string.h>
 
 /* New functions safe from a memory manageemnt point of view */

trunk/mondo/mondo/test/mktest

@@ -6 +6 @@
 #
 
-gcc -O2 -I../common test-conf.c ../common/libmondo-conf.c ../common/libmondo-msg.c -o test-conf
-gcc -O2 -I../common test-string.c ../common/libmondo-string.c ../common/libmondo-msg.c -o test-string
+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
 
 for f in "test-conf"; do

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

@@ -8 +8 @@
 #include <stdio.h>
 #include "my-stuff.h"
-#include "libmondo-conf.h"
+#include "mr_conf.h"
 
 int g_main_pid = 0;
@@ -19 +19 @@
     char *s = NULL;
     
-    if ((ret = mrconf_open("mondo.conf")) != 0) {
+    if ((ret = mr_conf_open("mondo.conf")) != 0) {
         fprintf(stderr,"Unable to open conf file (%d)\n",ret); 
         exit(-1);
     }
-    if ((i = mrconf_iread("testinteger")) == 0) {
+    if ((i = mr_conf_iread("testinteger")) == 0) {
         fprintf(stderr,"Unable to get integer\n");
         exit(-1);
     }
     fprintf(stdout, "Integer : ***%d***\n",i);
-    if ((f = mrconf_fread("testfloat")) == 0.0) {
+    if ((f = mr_conf_fread("testfloat")) == 0.0) {
         fprintf(stderr,"Unable to get float\n");
         exit(-1);
     }
     fprintf(stdout, "Float : ***%f***\n",f);
-    if (! (s = mrconf_sread("teststring"))) {
+    if (! (s = mr_conf_sread("teststring"))) {
         fprintf(stderr,"Unable to get string\n");
         exit(-1);
@@ -39 +39 @@
     fprintf(stdout, "String : ***%s***\n",s);
     paranoid_free(s);
-    mrconf_close();
+    mr_conf_close();
     exit(0);
 }

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

@@ -10 +10 @@
 #include <stdlib.h>
 #include <stdio.h>
+
 #include "my-stuff.h"
-#include "libmondo-string.h"
+#include "mr_string.h"
 
 main() {