Changeset 1081 in MondoRescue for trunk/mondo/src/mondoarchive

Timestamp:

Jan 28, 2007, 11:20:07 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1078:1080 $SVN_M/branches/stable

Location:

trunk/mondo/src/mondoarchive

Files:

• main.c (modified) (2 diffs)
• mondo-cli.c (modified) (2 diffs)

trunk/mondo/src/mondoarchive/main.c

@@ -1 @@
-/*
- * $Id$
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************
+/***************************************************************************
+* $Id$
+*/
+
+
+/**
+ * @file
  * The main file for mondoarchive.
  */
@@ -176 +174 @@
     diffs = 0;
     printf(_("Initializing...\n"));
-    if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
+    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
 
     /* Initialize Configuration Structure */

trunk/mondo/src/mondoarchive/mondo-cli.c

@@ -1 +1 @@
 /***************************************************************************
- * $Id$
- * 
+$Id$
+*******************************************************************/
+
+/**
+ * @file
  * Functions for handling command-line arguments passed to mondoarchive.
  */
@@ -522 +525 @@
     if (flag_set['z']) {
         if (find_home_of_exe("getfattr")) {
-            asprintf(&g_getfattr,"getfattr");
+            mr_asprintf(&g_getfattr,"getfattr");
         }
         if (find_home_of_exe("getfacl")) {
-            asprintf(&g_getfacl,"getfacl");
+            mr_asprintf(&g_getfacl,"getfacl");
         }
     }