Changeset 2296 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c

Timestamp:

Jul 23, 2009, 2:53:30 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Replace sprintf by mr_asprintf in mondo-rstr-compare.c
• All mr_asprintf call should be on one line (for quality script) and use a string as second param
• Improve quality script

File:

• branches/2.2.10/mondo/src/common/libmondo-cli.c (modified) (6 diffs)

branches/2.2.10/mondo/src/common/libmondo-cli.c

@@ -901 +901 @@
         }
         flag_set['d'] = TRUE;
-        mr_asprintf(&tmp1,
-                "You didn't specify a tape streamer device. I'm assuming %s",
-                flag_val['d']);
+        mr_asprintf(&tmp1, "You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
         log_to_screen(tmp1);
         mr_free(tmp1);
@@ -1184 +1182 @@
 
     if (flag_set['b']) {
-        mr_asprintf(&psz, flag_val['b']);
+        mr_asprintf(&psz, "%s", flag_val['b']);
         log_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -1230 +1228 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            mr_asprintf(&tmp1,
-                    "You specified kernel '%s', which does not exist\n",
-                    bkpinfo->kernel_path);
+            mr_asprintf(&tmp1, "You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
             log_to_screen(tmp1);
             mr_free(tmp1);
@@ -1272 +1268 @@
         if (i) {
             retval++;
-            mr_asprintf(&tmp2,
-                    "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
-                    bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
+            mr_asprintf(&tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
             log_to_screen(tmp2);
             mr_free(tmp2);
@@ -1593 +1587 @@
     case SIGKILL:
         mr_asprintf(&tmp, "SIGKILL");
-        mr_asprintf(&tmp2,
-               "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
+        mr_asprintf(&tmp2, "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
         break;
     case SIGTERM:
@@ -1606 +1599 @@
     case SIGSEGV:
         mr_asprintf(&tmp, "SIGSEGV");
-        mr_asprintf(&tmp2,
-               "Internal programming error. Please send a backtrace as well as your log.");
+        mr_asprintf(&tmp2, "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE: