From 8ded860d0b73bf90203bf5e0297ba82837340fd1 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 13 Feb 2010 19:55:53 +0100 Subject: Change source code indentation (indent -kr -i8 -hnl, mainly) --- src/utils.c | 327 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 158 insertions(+), 169 deletions(-) (limited to 'src/utils.c') diff --git a/src/utils.c b/src/utils.c index 7183b66..b74bc8c 100644 --- a/src/utils.c +++ b/src/utils.c @@ -31,218 +31,207 @@ static char *feh_user_name = NULL; static char *feh_tmp_dir = NULL; /* eprintf: print error message and exit */ -void -eprintf(char *fmt, ...) +void eprintf(char *fmt, ...) { - va_list args; + va_list args; - fflush(stdout); - fprintf(stderr, "%s ERROR: ", PACKAGE); + fflush(stdout); + fprintf(stderr, "%s ERROR: ", PACKAGE); - va_start(args, fmt); - vfprintf(stderr, fmt, args); - va_end(args); + va_start(args, fmt); + vfprintf(stderr, fmt, args); + va_end(args); - if (fmt[0] != '\0' && fmt[strlen(fmt) - 1] == ':') - fprintf(stderr, " %s", strerror(errno)); - fprintf(stderr, "\n"); - exit(2); + if (fmt[0] != '\0' && fmt[strlen(fmt) - 1] == ':') + fprintf(stderr, " %s", strerror(errno)); + fprintf(stderr, "\n"); + exit(2); } /* weprintf: print warning message and continue */ -void -weprintf(char *fmt, ...) +void weprintf(char *fmt, ...) { - va_list args; + va_list args; - fflush(stdout); - fprintf(stderr, "%s WARNING: ", PACKAGE); + fflush(stdout); + fprintf(stderr, "%s WARNING: ", PACKAGE); - va_start(args, fmt); - vfprintf(stderr, fmt, args); - va_end(args); + va_start(args, fmt); + vfprintf(stderr, fmt, args); + va_end(args); - if (fmt[0] != '\0' && fmt[strlen(fmt) - 1] == ':') - fprintf(stderr, " %s", strerror(errno)); - fprintf(stderr, "\n"); + if (fmt[0] != '\0' && fmt[strlen(fmt) - 1] == ':') + fprintf(stderr, " %s", strerror(errno)); + fprintf(stderr, "\n"); } /* estrdup: duplicate a string, report if error */ -char * -_estrdup(char *s) +char *_estrdup(char *s) { - char *t; + char *t; - if (!s) - return NULL; + if (!s) + return NULL; - t = (char *) malloc(strlen(s) + 1); - if (t == NULL) - eprintf("estrdup(\"%.20s\") failed:", s); - strcpy(t, s); - return t; + t = (char *) malloc(strlen(s) + 1); + if (t == NULL) + eprintf("estrdup(\"%.20s\") failed:", s); + strcpy(t, s); + return t; } /* emalloc: malloc and report if error */ -void * -_emalloc(size_t n) +void *_emalloc(size_t n) { - void *p; + void *p; - p = malloc(n); - if (p == NULL) - eprintf("malloc of %u bytes failed:", n); - return p; + p = malloc(n); + if (p == NULL) + eprintf("malloc of %u bytes failed:", n); + return p; } /* erealloc: realloc and report if error */ -void * -_erealloc(void *ptr, size_t n) +void *_erealloc(void *ptr, size_t n) { - void *p; + void *p; - p = realloc(ptr, n); - if (p == NULL) - eprintf("realloc of %p by %u bytes failed:", ptr, n); - return p; + p = realloc(ptr, n); + if (p == NULL) + eprintf("realloc of %p by %u bytes failed:", ptr, n); + return p; } -char * -estrjoin(const char *separator, ...) +char *estrjoin(const char *separator, ...) { - char *string, *s; - va_list args; - int len; - int separator_len; - - if (separator == NULL) - separator = ""; - - separator_len = strlen(separator); - va_start(args, separator); - s = va_arg(args, char *); - - if (s) - { - len = strlen(s); - s = va_arg(args, char *); - - while (s) - { - len += separator_len + strlen(s); - s = va_arg(args, char *); - } - va_end(args); - string = malloc(sizeof(char) * (len + 1)); - - *string = 0; - va_start(args, separator); - s = va_arg(args, char *); - - strcat(string, s); - s = va_arg(args, char *); - - while (s) - { - strcat(string, separator); - strcat(string, s); - s = va_arg(args, char *); - } - } - else - string = estrdup(""); - va_end(args); - - return string; + char *string, *s; + va_list args; + int len; + int separator_len; + + if (separator == NULL) + separator = ""; + + separator_len = strlen(separator); + va_start(args, separator); + s = va_arg(args, char *); + + if (s) { + len = strlen(s); + s = va_arg(args, char *); + + while (s) { + len += separator_len + strlen(s); + s = va_arg(args, char *); + } + va_end(args); + string = malloc(sizeof(char) * (len + 1)); + + *string = 0; + va_start(args, separator); + s = va_arg(args, char *); + + strcat(string, s); + s = va_arg(args, char *); + + while (s) { + strcat(string, separator); + strcat(string, s); + s = va_arg(args, char *); + } + } else + string = estrdup(""); + va_end(args); + + return string; } -char * -stroflen(char c, int l) +char *stroflen(char c, int l) { - static char buf[1024]; - int i = 0; - - buf[0] = '\0'; - while (l--) - buf[i++] = c; - buf[i] = '\0'; - return buf; + static char buf[1024]; + int i = 0; + + buf[0] = '\0'; + while (l--) + buf[i++] = c; + buf[i] = '\0'; + return buf; } /* free the result please */ char *feh_unique_filename(char *path, char *basename) { - char *tmpname; - char num[10]; - char cppid[10]; - static long int i = 1; - struct stat st; - pid_t ppid; - - D_ENTER(4); - /* Massive paranoia ;) */ - if (i > 999998) - i = 1; - - ppid = getpid(); - snprintf(cppid, sizeof(cppid), "%06ld", (long)ppid); - - /* make sure file doesn't exist */ - do - { - snprintf(num, sizeof(num), "%06ld", i++); - tmpname = - estrjoin("", path, "feh_", cppid, "_", num, "_", - basename, NULL); - } - while (stat(tmpname, &st) == 0); - D_RETURN(4, tmpname); + char *tmpname; + char num[10]; + char cppid[10]; + static long int i = 1; + struct stat st; + pid_t ppid; + + D_ENTER(4); + /* Massive paranoia ;) */ + if (i > 999998) + i = 1; + + ppid = getpid(); + snprintf(cppid, sizeof(cppid), "%06ld", (long) ppid); + + /* make sure file doesn't exist */ + do { + snprintf(num, sizeof(num), "%06ld", i++); + tmpname = estrjoin("", path, "feh_", cppid, "_", num, "_", basename, NULL); + } + while (stat(tmpname, &st) == 0); + D_RETURN(4, tmpname); } /* reads file into a string, but limits o 4095 chars and ensures a \0 */ -char *ereadfile(char *path) { - char buffer[4096]; - FILE *fp; - int count; - - fp = fopen(path, "r"); - if (!fp) - return NULL; - - count = fread(buffer, sizeof(char), sizeof(buffer) - 1, fp); - if (buffer[count - 1] == '\n') - buffer[count - 1] = '\0'; - else - buffer[count] = '\0'; - - fclose(fp); - - return estrdup(buffer); -} +char *ereadfile(char *path) +{ + char buffer[4096]; + FILE *fp; + int count; + + fp = fopen(path, "r"); + if (!fp) + return NULL; + + count = fread(buffer, sizeof(char), sizeof(buffer) - 1, fp); + if (buffer[count - 1] == '\n') + buffer[count - 1] = '\0'; + else + buffer[count] = '\0'; -char *feh_get_tmp_dir(void) { - char *tmp; - if (feh_tmp_dir) - return feh_tmp_dir; - tmp = getenv("TMPDIR"); - if (!tmp) - tmp = getenv("TMP"); - if (!tmp) - tmp = getenv("TEMP"); - if (!tmp) - tmp = "/tmp"; - feh_tmp_dir = estrdup(tmp); - return feh_tmp_dir; + fclose(fp); + + return estrdup(buffer); } -char *feh_get_user_name(void) { - struct passwd *pw = NULL; +char *feh_get_tmp_dir(void) +{ + char *tmp; + if (feh_tmp_dir) + return feh_tmp_dir; + tmp = getenv("TMPDIR"); + if (!tmp) + tmp = getenv("TMP"); + if (!tmp) + tmp = getenv("TEMP"); + if (!tmp) + tmp = "/tmp"; + feh_tmp_dir = estrdup(tmp); + return feh_tmp_dir; +} - if (feh_user_name) - return feh_user_name; - setpwent (); - pw = getpwuid (getuid ()); - endpwent (); - feh_user_name = estrdup(pw->pw_name); - return feh_user_name; +char *feh_get_user_name(void) +{ + struct passwd *pw = NULL; + + if (feh_user_name) + return feh_user_name; + setpwent(); + pw = getpwuid(getuid()); + endpwent(); + feh_user_name = estrdup(pw->pw_name); + return feh_user_name; } -- cgit v1.2.3