From: Adam Dickmeiss Date: Wed, 3 Nov 2004 22:33:17 +0000 (+0000) Subject: Using blanks for assignments (no code changes) X-Git-Tag: YAZ.2.0.28~6 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=3dc194a876fec3eeb9623f7a14cabf7eb0b4a2dc;p=yaz-moved-to-github.git Using blanks for assignments (no code changes) --- diff --git a/include/yaz/log.h b/include/yaz/log.h index bd4d516..2407bf2 100644 --- a/include/yaz/log.h +++ b/include/yaz/log.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-2003, Index Data. + * Copyright (c) 1995-2004, Index Data. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation, in whole or in part, for any purpose, is hereby granted, @@ -23,7 +23,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: log.h,v 1.16 2004-11-03 14:25:06 heikki Exp $ + * $Id: log.h,v 1.17 2004-11-03 22:33:17 adam Exp $ */ /** @@ -67,16 +67,16 @@ YAZ_BEGIN_CDECL YAZ_EXPORT void yaz_log_init(int level, const char *prefix, const char *name); /** yaz_log_init_file sets the file name used for yaz_log */ -YAZ_EXPORT void yaz_log_init_file (const char *fname); +YAZ_EXPORT void yaz_log_init_file(const char *fname); /** yaz_log_init_level sets the logging level. Use an OR of the bits above */ -YAZ_EXPORT void yaz_log_init_level (int level); +YAZ_EXPORT void yaz_log_init_level(int level); /** yaz_log_init_prefix sets the log prefix */ -YAZ_EXPORT void yaz_log_init_prefix (const char *prefix); +YAZ_EXPORT void yaz_log_init_prefix(const char *prefix); /** yaz_log_init_prefix2 sets an optional second prefix */ -YAZ_EXPORT void yaz_log_init_prefix2 (const char *prefix); +YAZ_EXPORT void yaz_log_init_prefix2(const char *prefix); /** * yaz_log_time_format sets the format of the timestamp. See man 3 strftime @@ -108,10 +108,10 @@ YAZ_EXPORT void yaz_log(int level, const char *fmt, ...) * is specified, which clears the list. If a name matches the name of a * LOG_BIT above, that one is set. Otherwise a new value is picked, and given * to that name, to be found with yaz_log_module_level */ -YAZ_EXPORT int yaz_log_mask_str (const char *str); +YAZ_EXPORT int yaz_log_mask_str(const char *str); /** yaz_log_mask_str_x is like yaz_log_mask_str, but with a given start value*/ -YAZ_EXPORT int yaz_log_mask_str_x (const char *str, int level); +YAZ_EXPORT int yaz_log_mask_str_x(const char *str, int level); /** * yaz_log_module_level returns a log level mask corresponding to the module @@ -124,9 +124,9 @@ YAZ_EXPORT int yaz_log_module_level(const char *name); /** yaz_log_file returns the file handle for yaz_log. */ YAZ_EXPORT FILE *yaz_log_file(void); -YAZ_EXPORT void log_event_start (void (*func)(int level, const char *msg, void *info), +YAZ_EXPORT void log_event_start(void (*func)(int level, const char *msg, void *info), void *info); -YAZ_EXPORT void log_event_end (void (*func)(int level, const char *msg, void *info), +YAZ_EXPORT void log_event_end(void (*func)(int level, const char *msg, void *info), void *info); YAZ_EXPORT void yaz_log_reopen(void); diff --git a/src/log.c b/src/log.c index 91a28dc..4ee727c 100644 --- a/src/log.c +++ b/src/log.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: log.c,v 1.10 2004-11-03 17:52:53 heikki Exp $ + * $Id: log.c,v 1.11 2004-11-03 22:33:17 adam Exp $ */ /** @@ -37,8 +37,8 @@ #include #include -static NMEM_MUTEX log_mutex=0; -static int mutex_init_flag=0; /* not yet initialized */ +static NMEM_MUTEX log_mutex = 0; +static int mutex_init_flag = 0; /* not yet initialized */ #define HAS_STRERROR 1 @@ -47,8 +47,8 @@ static int mutex_init_flag=0; /* not yet initialized */ #else char *strerror(int n) { - extern char *sys_errlist[]; - return sys_errlist[n]; + extern char *sys_errlist[]; + return sys_errlist[n]; } #endif @@ -61,15 +61,15 @@ static char l_prefix[512] = ""; static char l_prefix2[512] = ""; static char l_fname[512] = ""; -static char l_old_default_format[]="%H:%M:%S-%d/%m"; -static char l_new_default_format[]="%Y%m%d-%H%M%S"; +static char l_old_default_format[] = "%H:%M:%S-%d/%m"; +static char l_new_default_format[] = "%Y%m%d-%H%M%S"; #define TIMEFORMAT_LEN 50 -static char l_custom_format[TIMEFORMAT_LEN]=""; -static char *l_actual_format=l_old_default_format; +static char l_custom_format[TIMEFORMAT_LEN] = ""; +static char *l_actual_format = l_old_default_format; /** l_max_size tells when to rotate the log. Default to 1 GB */ -static const int l_def_max_size=1024*1024*1024; -static int l_max_size=1024*1024*1024; +static const int l_def_max_size = 1024*1024*1024; +static int l_max_size = 1024*1024*1024; #define MAX_MASK_NAMES 35 /* 32 bits plus a few combo names */ static struct { @@ -93,14 +93,14 @@ static struct { { 0, NULL } /* the rest will be filled in if the user defines dynamic modules*/ }; -static unsigned int next_log_bit=LOG_LAST_BIT<<1; /* first dynamic bit */ +static unsigned int next_log_bit = LOG_LAST_BIT<<1; /* first dynamic bit */ static void init_mutex() { if (mutex_init_flag) return; nmem_mutex_create (&log_mutex); - mutex_init_flag=1; + mutex_init_flag = 1; } @@ -133,7 +133,7 @@ void yaz_log_reopen(void) if (!l_file) l_file = stderr; if (!*l_fname) - new_file=stderr; + new_file = stderr; else if (!(new_file = fopen(l_fname, "a"))) return; if (l_file != stderr) @@ -152,12 +152,12 @@ static void rotate_log() return; /* can't rotate that */ if (!*l_fname) return; /* hmm, no name, can't rotate */ - strncpy(newname, l_fname, 510); - newname[510]='\0'; /* make sure it is terminated */ + strncpy(newname, l_fname, 509); + newname[509] = '\0'; /* make sure it is terminated */ strcat(newname,".1"); #ifdef WIN32 fclose(l_file); - l_file=stderr; + l_file = stderr; #endif rename(l_fname, newname); yaz_log_reopen(); @@ -203,9 +203,9 @@ void yaz_log_init(int level, const char *prefix, const char *fname) void yaz_log_init_max_size(int mx) { if (mx <0) - l_max_size=l_def_max_size; + l_max_size = l_def_max_size; else - l_max_size=mx; + l_max_size = mx; } static void (*start_hook_func)(int, const char *, void *) = NULL; @@ -232,7 +232,7 @@ void yaz_log(int level, const char *fmt, ...) int i; time_t ti; struct tm *tim; - char tbuf[TIMEFORMAT_LEN]=""; + char tbuf[TIMEFORMAT_LEN] = ""; int o_level = level; int flen; @@ -246,7 +246,7 @@ void yaz_log(int level, const char *fmt, ...) if ((l_file != stderr) && (l_max_size>0)) { nmem_mutex_enter (log_mutex); - flen=ftell(l_file); + flen = ftell(l_file); if (flen>l_max_size) rotate_log(); nmem_mutex_leave (log_mutex); @@ -285,10 +285,10 @@ void yaz_log(int level, const char *fmt, ...) ti = time(0); tim = localtime(&ti); if (l_level & LOG_NOTIME) - tbuf[0]='\0'; + tbuf[0] = '\0'; else - strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim); - tbuf[TIMEFORMAT_LEN-1]='\0'; + strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim); + tbuf[TIMEFORMAT_LEN-1] = '\0'; fprintf(l_file, "%s %s%s %s%s\n", tbuf, l_prefix, flags, l_prefix2, buf); if (l_level & (LOG_FLUSH|LOG_DEBUG) ) @@ -311,7 +311,7 @@ void yaz_log_time_format(const char *fmt) } /* else use custom format */ strncpy(l_custom_format, fmt, TIMEFORMAT_LEN-1); - l_custom_format[TIMEFORMAT_LEN-1]='\0'; + l_custom_format[TIMEFORMAT_LEN-1] = '\0'; l_actual_format = l_custom_format; } @@ -321,15 +321,15 @@ static char *clean_name(const char *name, int len, char *namebuf, int buflen) char *p; char *start; if (buflen =MAX_MASK_NAMES) || (next_log_bit >= 1<<31 )) { yaz_log(LOG_WARN,"No more log bits left, not logging '%s'", name); return 0; } - mask_names[i].mask= next_log_bit; - next_log_bit= next_log_bit<<1; - mask_names[i].name=xstrdup(name); - mask_names[i+1].name=NULL; - mask_names[i+1].mask=0; + mask_names[i].mask = next_log_bit; + next_log_bit = next_log_bit<<1; + mask_names[i].name = xstrdup(name); + mask_names[i+1].name = NULL; + mask_names[i+1].mask = 0; return mask_names[i].mask; } @@ -357,8 +357,8 @@ int yaz_log_module_level(const char *name) { int i; char clean[255]; - char *n=clean_name(name, strlen(name), clean, sizeof(clean)); - for (i=0;mask_names[i].name;i++) + char *n = clean_name(name, strlen(name), clean, sizeof(clean)); + for (i = 0; mask_names[i].name; i++) if (0==strcmp(n,mask_names[i].name)) return mask_names[i].mask; return 0; @@ -374,22 +374,22 @@ int yaz_log_mask_str_x (const char *str, int level) const char *p; int i; int found; - char clean[255]=""; - char *n=clean; + char clean[255] = ""; + char *n = clean; while (*str) { - found=0; + found = 0; for (p = str; *p && *p != ','; p++) ; if (*str == '-' || isdigit(*str)) { level = atoi (str); - found=1; + found = 1; } else { - n=clean_name(str, p-str, clean, sizeof(clean)); + n = clean_name(str, p-str, clean, sizeof(clean)); for (i = 0; mask_names[i].name; i++) /*if (strlen (mask_names[i].name) == (size_t) (p-str) && memcmp (mask_names[i].name, str, p-str) == 0)*/ @@ -399,7 +399,7 @@ int yaz_log_mask_str_x (const char *str, int level) level |= mask_names[i].mask; else level = 0; - found=1; + found = 1; } } if (!found) diff --git a/src/nmem.c b/src/nmem.c index 9738a6f..73d65e7 100644 --- a/src/nmem.c +++ b/src/nmem.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data. * See the file LICENSE for details. * - * $Id: nmem.c,v 1.4 2004-10-15 00:19:00 adam Exp $ + * $Id: nmem.c,v 1.5 2004-11-03 22:33:17 adam Exp $ */ /** @@ -361,7 +361,7 @@ void nmem_destroy(NMEM n) void nmem_transfer (NMEM dst, NMEM src) { nmem_block *t; - while ((t=src->blocks)) + while ((t = src->blocks)) { src->blocks = t->next; t->next = dst->blocks; @@ -484,8 +484,8 @@ void yaz_strerror(char *buf, int max) #endif /* UNIX */ #endif - if ((cp=strrchr(buf, '\n'))) + if ((cp = strrchr(buf, '\n'))) *cp = '\0'; - if ((cp=strrchr(buf, '\r'))) + if ((cp = strrchr(buf, '\r'))) *cp = '\0'; }