Changeset 3645 for branches


Ignore:
Timestamp:
Jan 3, 2017, 2:06:25 AM (2 years ago)
Author:
bruno
Message:

Minor improvements in msgs

Location:
branches/3.3/mondo/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3/mondo/src/lib/mr_mem.c

    r3643 r3645  
    3636        *allocated = NULL;
    3737    } else {
    38         mr_msg_int(98,line,file,"mr_asprintf","Attempt to free NULL pointer");
     38        mr_msg_int(98,line,file,"mr_free_int","Attempt to free NULL pointer");
    3939    }
    4040}
     
    4747    ret = malloc(size);
    4848    if (ret == NULL) {
    49         mr_msg_int(1,line,file,"mr_asprintf","Unable to alloc memory in mr_malloc\nExiting...");
     49        mr_msg_int(1,line,file,"mr_malloc_int","Unable to alloc memory in mr_malloc\nExiting...");
    5050        mr_exit(-1,"Unable to alloc memory in mr_malloc");
    5151    }
     
    6262    res = vasprintf(strp, fmt, args);
    6363    if (res == -1) {
    64         mr_msg_int(1,line,file,"mr_asprintf","Unable to alloc memory in mr_asprintf\nExiting...");
     64        mr_msg_int(1,line,file,"mr_asprintf_int","Unable to alloc memory in mr_asprintf\nExiting...");
    6565        mr_exit(-1,"Unable to alloc memory in mr_asprintf");
    6666    }
  • branches/3.3/mondo/src/restore-scripts/mondo/mr-grub

    r3542 r3645  
    1414
    1515FindBootPart() {
     16    # Work only for grub v1
    1617    local i
    1718    bootpart=""
     
    175176echo ".............Cool." 2>&1 | tee -a $LOGFILE
    176177
    177 grub=`FindPathOfRESTExe grub`
     178grub=`FindPathOfRESTExe grub | head -1`
    178179mkdir -p /boot
    179180[ "$MNT_RESTORING" ] && ln -sf /mnt/RESTORING/boot/grub /boot/grub
     181[ "$MNT_RESTORING" ] && ln -sf /mnt/RESTORING/boot/grub2 /boot/grub2
    180182
    181183# ---------------------------------
Note: See TracChangeset for help on using the changeset viewer.