Ignore:
Timestamp:
Feb 16, 2007, 2:16:14 PM (13 years ago)
Author:
bruno
Message:

Some merges from stable (synchro for mem. mngt)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/src/common/libmondo-devices.c

    r1161 r1176  
    1919#include "mr_mem.h"
    2020#include "mr_msg.h"
     21#include "mr_str.h"
    2122
    2223#include <sys/ioctl.h>
     
    4142
    4243extern bool g_ISO_restore_mode;
    43 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
    4444extern char *g_erase_tmpdir_and_scratchdir;
    4545extern char *g_selfmounted_isodir;
     
    10931093
    10941094    FILE *pin = NULL;
    1095     bool retval;
     1095    bool retval = FALSE;
    10961096    size_t n = 0;
    10971097    assert_string_is_neither_NULL_nor_zerolength(format);
     
    11121112    if (!pin) {
    11131113        log_OS_error("Unable to read good formats");
    1114         retval = FALSE;
    11151114    } else {
    11161115        mr_getline(&good_formats, &n , pin);
     
    11181117            log_OS_error("Cannot pclose good formats");
    11191118        }
    1120         strip_spaces(good_formats);
     1119        mr_strip_spaces(good_formats);
    11211120        // " ntfs 7 " -- um, cheating much? :)
    11221121        mr_asprintf(&tmp, " %s swap lvm raid ntfs 7 ",good_formats);
     
    11261125        if (strstr(good_formats, format_sz)) {
    11271126            retval = TRUE;
    1128         } else {
    1129             retval = FALSE;
    11301127        }
    11311128        mr_free(good_formats);
     
    16931690            // check whether already mounted - we better remove
    16941691            // surrounding spaces and trailing '/' for this
    1695             /* BERLIOS: Useless
    1696             strip_spaces(bkpinfo->nfs_mount);
    1697             */
     1692            mr_strip_spaces(bkpinfo->nfs_mount);
    16981693            if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
    16991694                bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
     
    22702265    for (mr_getline(&current_drive, &n, pdrives); !feof(pdrives);
    22712266         mr_getline(&current_drive, &n, pdrives)) {
    2272         strip_spaces(current_drive);
     2267        mr_strip_spaces(current_drive);
    22732268        log_it("looking at drive %s's MBR", current_drive);
    22742269        if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
Note: See TracChangeset for help on using the changeset viewer.