Ignore:
Timestamp:
Feb 20, 2007, 3:03:55 AM (12 years ago)
Author:
bruno
Message:

Stable merges again

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/src/mondoarchive/mondo-cli.c

    r1086 r1188  
    1111
    1212#include "my-stuff.h"
    13 #include "../common/mondostructures.h"
     13#include "mondostructures.h"
    1414#include "mondo-cli-EXT.h"
    15 #include "../common/libmondo.h"
     15#include "libmondo.h"
    1616#ifndef S_SPLINT_S
    1717#include <pthread.h>
    1818#endif
    1919#include "mr_mem.h"
     20#include "mr_msg.h"
     21
     22//static char cvsid[] = "$Id$";
    2023
    2124extern int g_loglevel;
     
    2326extern bool g_skip_floppies;    ///< Whether to skip the creation of boot disks
    2427extern bool g_cd_recovery;
    25 extern double g_kernel_version;
    26 extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
    2728
    2829/**
     
    6364    int res = 0;
    6465    int retval = 0;
    65     int i = 0, j;
     66    int i = 0, j = 0;
    6667
    6768    /*@ buffers *************** */
    68     char *tmp;
     69    char *tmp = NULL;
    6970    char *flag_val[128];
    7071    bool flag_set[128];
     
    9596    for (i = 0; i < 128; i++) {
    9697        if (flag_set[i]) {
    97             mr_asprintf(&tmp, "-%c %s", i, flag_val[i]);
    98             mr_msg(3, tmp);
    99             mr_free(tmp);
     98            mr_msg(3, "-%c %s", i, flag_val[i]);
    10099        }
    101100    }
Note: See TracChangeset for help on using the changeset viewer.