diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2004-12-15 13:23:56 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2004-12-15 13:23:56 +0000 |
| commit | b97229e102d6f03d31b6a5cd1a5a5775833be1d1 (patch) | |
| tree | 0f14704a111cf6201e884b03100a952abf0c2dc6 | |
| parent | 3e3f4ce9a65d77a5506d73a5f6e32dac4c1e914b (diff) | |
| download | drakx-backup-do-not-use-b97229e102d6f03d31b6a5cd1a5a5775833be1d1.tar drakx-backup-do-not-use-b97229e102d6f03d31b6a5cd1a5a5775833be1d1.tar.gz drakx-backup-do-not-use-b97229e102d6f03d31b6a5cd1a5a5775833be1d1.tar.bz2 drakx-backup-do-not-use-b97229e102d6f03d31b6a5cd1a5a5775833be1d1.tar.xz drakx-backup-do-not-use-b97229e102d6f03d31b6a5cd1a5a5775833be1d1.zip | |
rename log to do_log in order to avoid clashes with builtins
| -rw-r--r-- | mdk-stage1/insmod-modutils/include/util.h | 2 | ||||
| -rw-r--r-- | mdk-stage1/insmod-modutils/util/logger.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mdk-stage1/insmod-modutils/include/util.h b/mdk-stage1/insmod-modutils/include/util.h index 0a1354bec..8154818ea 100644 --- a/mdk-stage1/insmod-modutils/include/util.h +++ b/mdk-stage1/insmod-modutils/include/util.h @@ -39,7 +39,7 @@ typedef int (*xftw_func_t)(const char *, const struct stat *); extern int xftw(const char *directory, xftw_func_t); /* Error logging */ -extern int log; +extern int do_log; extern int errors; extern const char *error_file; diff --git a/mdk-stage1/insmod-modutils/util/logger.c b/mdk-stage1/insmod-modutils/util/logger.c index 4774a0beb..55920f4db 100644 --- a/mdk-stage1/insmod-modutils/util/logger.c +++ b/mdk-stage1/insmod-modutils/util/logger.c @@ -31,7 +31,7 @@ /*======================================================================*/ -int log; +int do_log = 0; int errors; const char *error_file; @@ -57,7 +57,7 @@ void setsyslog(const char *program) #ifdef STOREMSG atexit(dumpmsg); #endif - log = 1; + do_log = 1; } #ifdef _STANDALONE_ @@ -87,7 +87,7 @@ void error(const char *fmt,...) if (silent) ; - else if (log) { + else if (do_log) { char buf[2*PATH_MAX]; int n; @@ -120,7 +120,7 @@ void lprintf(const char *fmt,...) va_list args; if (silent); - else if (log) { + else if (do_log) { char buf[2*PATH_MAX]; va_start(args, fmt); vsnprintf(buf, sizeof(buf), fmt, args); |