Changeset 1103 in MondoRescue for branches/stable/mondo/src/common/libmondo-filelist.c

Timestamp:

Feb 6, 2007, 11:10:01 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix again another set of compiler warnings (Michel Loiseleur <mloiseleur_at_linagora.com>)

File:

• branches/stable/mondo/src/common/libmondo-filelist.c (modified) (4 diffs)

branches/stable/mondo/src/common/libmondo-filelist.c

@@ -420 +420 @@
     }
     filelist->ch = '\0';
-    mr_free(filelist);
+    mr_free((void*) filelist);
     depth--;
     if (depth == 0) {
@@ -429 +429 @@
 
 
-int call_exe_and_pipe_output_to_fd(char *syscall, FILE * pout)
+int call_exe_and_pipe_output_to_fd(char *sys_call, FILE * pout)
 {
     FILE *pattr;
     char *tmp;
-    pattr = popen(syscall, "r");
+    pattr = popen(sys_call, "r");
     if (!pattr) {
-        log_msg(1, "Failed to open fattr() %s", syscall);
+        log_msg(1, "Failed to open fattr() %s", sys_call);
         return (1);
     }
     if (feof(pattr)) {
-        log_msg(1, "Failed to call fattr() %s", syscall);
+        log_msg(1, "Failed to call fattr() %s", sys_call);
         paranoid_pclose(pattr);
         return (2);
@@ -461 +461 @@
     FILE *pout;
     char *pout_command;
-    char *syscall;
+    char *sys_call;
     char *file_to_analyze;
     char *strtmp = NULL;
@@ -487 +487 @@
         log_msg(8, "Analyzing %s", file_to_analyze);
         asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
-        asprintf(&syscall, "%s 2>> /dev/null", strtmp); // " MONDO_LOGFILE);
+        asprintf(&sys_call, "%s 2>> /dev/null", strtmp);    // " MONDO_LOGFILE);
         mr_free(strtmp);
-        call_exe_and_pipe_output_to_fd(syscall, pout);
-        mr_free(syscall);
+        call_exe_and_pipe_output_to_fd(sys_call, pout);
+        mr_free(sys_call);
     }
     paranoid_fclose(fin);