diff options
author | Michael Stapelberg <michael@stapelberg.de> | 2015-03-16 10:00:32 +0100 |
---|---|---|
committer | Michael Stapelberg <michael@stapelberg.de> | 2015-03-16 10:01:07 +0100 |
commit | d74e904bf4bdd7f1d767a8db09987b90de809579 (patch) | |
tree | 07ab4f610c2f222a662daf417f1356154806c29e /src/general.c | |
parent | 6996f0a4a34e0744f09dbce39a2164c6fcee875e (diff) |
clang-format-3.5 -i **/*.[ch], update modeline
From here on, we’ll use clang-format to automatically format the source.
This has worked well in i3, so we are introducing it for i3status.
Diffstat (limited to 'src/general.c')
-rw-r--r-- | src/general.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/general.c b/src/general.c index c5b33b4..f299a2b 100644 --- a/src/general.c +++ b/src/general.c @@ -1,4 +1,4 @@ -// vim:ts=8:expandtab +// vim:ts=4:sw=4:expandtab #include <sys/types.h> #include <string.h> #include <stdarg.h> @@ -15,18 +15,18 @@ * */ bool slurp(const char *filename, char *destination, int size) { - int fd; + int fd; - if ((fd = open(filename, O_RDONLY)) == -1) - return false; + if ((fd = open(filename, O_RDONLY)) == -1) + return false; - /* We need one byte for the trailing 0 byte */ - int n = read(fd, destination, size-1); - if (n != -1) - destination[n] = '\0'; - (void)close(fd); + /* We need one byte for the trailing 0 byte */ + int n = read(fd, destination, size - 1); + if (n != -1) + destination[n] = '\0'; + (void)close(fd); - return true; + return true; } /* @@ -35,15 +35,15 @@ bool slurp(const char *filename, char *destination, int size) { * */ char *skip_character(char *input, char character, int amount) { - char *walk; - size_t len = strlen(input); - int blanks = 0; + char *walk; + size_t len = strlen(input); + int blanks = 0; - for (walk = input; ((size_t)(walk - input) < len) && (blanks < amount); walk++) - if (*walk == character) - blanks++; + for (walk = input; ((size_t)(walk - input) < len) && (blanks < amount); walk++) + if (*walk == character) + blanks++; - return (walk == input ? walk : walk-1); + return (walk == input ? walk : walk - 1); } /* @@ -51,12 +51,12 @@ char *skip_character(char *input, char character, int amount) { * */ void die(const char *fmt, ...) { - char buffer[512]; - va_list ap; - va_start(ap, fmt); - (void)vsnprintf(buffer, sizeof(buffer), fmt, ap); - va_end(ap); - - fprintf(stderr, "%s", buffer); - exit(EXIT_FAILURE); + char buffer[512]; + va_list ap; + va_start(ap, fmt); + (void)vsnprintf(buffer, sizeof(buffer), fmt, ap); + va_end(ap); + + fprintf(stderr, "%s", buffer); + exit(EXIT_FAILURE); } |