Changeset 1627


Ignore:
Timestamp:
Sep 9, 2007, 2:12:49 AM (12 years ago)
Author:
bruno
Message:

Some define cleanup in my-stuff.h

Location:
branches/stable/mondo/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/common/libmondo-archive.c

    r1621 r1627  
    10811081        if (!does_file_exist(archiving_filelist_fname)) {
    10821082            mr_msg(3,
    1083                     "%s[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.",
    1084                     FORTY_SPACES, getpid(), this_thread_no,
     1083                    "[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.",
     1084                    getpid(), this_thread_no,
    10851085                    archiving_set_no);
    10861086            break;
     
    10901090                 archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
    10911091        if (does_file_exist(tmp)) {
    1092             mr_msg(4, "%s[%d:%d] - waiting for storer",
    1093                     FORTY_SPACES, getpid(), this_thread_no);
     1092            mr_msg(4, "[%d:%d] - waiting for storer",
     1093                    getpid(), this_thread_no);
    10941094            while (does_file_exist(tmp)) {
    10951095                sleep(1);
     
    10991099        mr_free(tmp);
    11001100
    1101         mr_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
     1101        mr_msg(4, "[%d:%d] - EXATing %d...", getpid(),
    11021102                this_thread_no, archiving_set_no);
    11031103        if (g_getfattr) {
     
    11141114        }
    11151115
    1116         mr_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
     1116        mr_msg(4, "[%d:%d] - archiving %d...", getpid(),
    11171117                this_thread_no, archiving_set_no);
    11181118        res = archive_this_fileset(bkpinfo, archiving_filelist_fname,
     
    11411141            fatal_error("Cannot get semaphore V");
    11421142        }
    1143         mr_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(),
     1143        mr_msg(4, "[%d:%d] - archived %d OK", getpid(),
    11441144                this_thread_no, archiving_set_no);
    11451145        archiving_set_no++;
     
    11521152        fatal_error("Cannot get semaphore V");
    11531153    }
    1154     mr_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(),
     1154    mr_msg(3, "[%d:%d] - exiting", getpid(),
    11551155            this_thread_no);
    11561156    mr_free(archiving_filelist_fname);
  • branches/stable/mondo/src/common/libmondo-filelist.c

    r1553 r1627  
    15901590        mr_msg(1, "Calculating filelist");
    15911591        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s . .. \
    1592 " MNT_CDROM " " MNT_FLOPPY " /media \
     1592" MNT_CDROM " /mnt/floppy /media \
    15931593/proc /sys /tmp /var/log/lastlog /root/images/mondo " MINDI_CACHE " " MONDO_CACHE, excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
    15941594
  • branches/stable/mondo/src/common/libmondo-tools.c

    r1625 r1627  
    10351035        run_program_and_log_output("mount " MNT_CDROM, FALSE);
    10361036    }
    1037     if (g_remount_floppy_at_end) {
    1038         run_program_and_log_output("mount " MNT_FLOPPY, FALSE);
    1039     }
    10401037}
    10411038
     
    10491046        g_remount_cdrom_at_end = TRUE;
    10501047        run_program_and_log_output("umount " MNT_CDROM, FALSE);
    1051     }
    1052     if (run_program_and_log_output
    1053         ("mount | grep floppy | grep super", FALSE) == 0) {
    1054         g_remount_floppy_at_end = TRUE;
    1055         run_program_and_log_output("umount " MNT_FLOPPY, FALSE);
    10561048    }
    10571049}
  • branches/stable/mondo/src/common/newt-specific.c

    r1594 r1627  
    1212
    1313#define MAX_NEWT_COMMENT_LEN 200
     14#define WELCOME_STRING _("W E L C O M E   T O   M O N D O   R E S C U E")
    1415
    1516#include <stdio.h>
  • branches/stable/mondo/src/include/my-stuff.h

    r1625 r1627  
    172172 */
    173173#define IS_THIS_A_STREAMING_BACKUP(x) (x == tape || x == udev || x == cdstream)
    174 
    175 /**
    176  * Welcome string displayed at the top of the newt interface.
    177  */
    178 #define WELCOME_STRING _("W E L C O M E   T O   M O N D O   R E S C U E")
    179174
    180175/**
     
    283278#define ARCH_THREADS 2          ///< The number of simultaneous threads running afio in the background.
    284279#define ARCH_BUFFER_NUM (ARCH_THREADS*4)    // Number of permissible queued afio files
    285 #define FORTY_SPACES "                                         "    ///< 40 spaces.
    286280#define PPCFG_RAMDISK_SIZE 350  ///< Size of the tmpfs, in megabytes, to attempt to mount (to speed up Mondo).
    287 
    288 #define DO_MBR_PLEASE "/tmp/DO-MBR-PLEASE"
    289 
    290281
    291282/**
     
    298289
    299290#define MNT_CDROM "/mnt/cdrom"
    300 #define MNT_FLOPPY "/mnt/floppy"
    301291
    302292#endif                          /* _MY_STUFF_H_ */
Note: See TracChangeset for help on using the changeset viewer.