Changeset 2257


Ignore:
Timestamp:
Jul 5, 2009, 6:56:03 PM (10 years ago)
Author:
bruno
Message:
  • Reorder code to allow compilation by older gcc versions
File:
1 edited

Legend:

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

    r2242 r2257  
    12771277    char *command = NULL;
    12781278    int retval;
    1279 
    1280     assert_string_is_neither_NULL_nor_zerolength(device);
    1281     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
    1282 
    1283     make_hole_for_dir(mountpoint);
    1284 
    12851279#ifdef __FreeBSD__
    12861280    char *dev = NULL;
    12871281#else
    12881282    char *options = NULL;
    1289     mr_asprintf(&options, "ro");
    1290 #endif
     1283#endif
     1284
     1285    assert_string_is_neither_NULL_nor_zerolength(device);
     1286    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
     1287
     1288    make_hole_for_dir(mountpoint);
    12911289
    12921290    if (isdigit(device[0])) {
    12931291        find_cdrom_device(device, FALSE);
    12941292    }
     1293#ifndef __FreeBSD__
     1294    mr_asprintf(&options, "ro");
     1295#endif
     1296
    12951297    if (g_ISO_restore_mode) {
    12961298
Note: See TracChangeset for help on using the changeset viewer.