From ccd8f1acc6c61261949af802a56471fcde964cad Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Mon, 19 Aug 2013 02:16:16 +0000 Subject: [PATCH] Added style + indent rule, fixed some indenting as well --- ftepp.c | 6 +++--- include.mk | 10 +++++++--- test.c | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ftepp.c b/ftepp.c index e79dcd7..5f414f3 100644 --- a/ftepp.c +++ b/ftepp.c @@ -184,7 +184,7 @@ static char *ftepp_predef_timestamp(lex_file *context) { char *value; size_t size; #ifdef _MSC_VER - char buffer[64]; + char buffer[64]; #endif if (stat(context->name, &finfo)) return util_strdup("\"\""); @@ -197,8 +197,8 @@ static char *ftepp_predef_timestamp(lex_file *context) { #ifndef _MSC_VER find = ctime(&finfo.st_mtime); #else - ctime_s(buffer, sizeof(buffer), &finfo.st_mtime); - find = buffer; + ctime_s(buffer, sizeof(buffer), &finfo.st_mtime); + find = buffer; #endif value = (char*)mem_a(strlen(find) + 1); diff --git a/include.mk b/include.mk index 7624473..3037289 100644 --- a/include.mk +++ b/include.mk @@ -108,9 +108,13 @@ uninstall: rm -f $(DESTDIR)$(MANDIR)/man1/doc/qcvm.1 rm -f $(DESTDIR)$(MANDIR)/man1/doc/gmqpak.1 -whitespace: - find . -type f \( -name '*.[ch]' -or -name '*.def' \) -exec sed -i 's/ *$$//' '{}' ';' +STYLE_MATCH = \( -name '*.[ch]' -or -name '*.def' \) +whitespace: + find . -type f $(STYLE_MATCH) -exec sed -i 's/ *$$//' '{}' ';' newline: - find . -type f \( -name '*.[ch]' -or -name '*.def' \) -exec sed -i -e '$$a\' '{}' ';' + find . -type f $(STYLE_MATCH) -exec sed -i -e '$$a\' '{}' ';' +indent: + find . -type f $(STYLE_MATCH) -exec sed -i 's/\t/ /g' '{}' ';' +style: whitespace newline indent diff --git a/test.c b/test.c index f3aa6bb..64c9928 100644 --- a/test.c +++ b/test.c @@ -166,8 +166,8 @@ static int task_pclose(FILE **handles) { tmpnam(open->name_err); tmpnam(open->name_out); #else - tmpnam_s(open->name_err, L_tmpnam); - tmpnam_s(open->name_out, L_tmpnam); + tmpnam_s(open->name_err, L_tmpnam); + tmpnam_s(open->name_out, L_tmpnam); #endif (void)mode; /* excluded */ @@ -193,8 +193,8 @@ static int task_pclose(FILE **handles) { mem_d(open); } -# define popen _popen -# define pclose _pclose +# define popen _popen +# define pclose _pclose #endif /*! _WIN32 */ #define TASK_COMPILE 0 -- 2.39.2