table

чување 9db9187cffd662be39c49cb2c7326a82ebcdac14
родитељ 04dc27eec51eaaa0d7cd765d3991d893792c6458
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Fri, 13 Aug 2021 21:11:09 +0200

Added do-while(0) to macros to aid automatic indentation

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
table.c
 | 
42
+++++++++++++++++++++---------------------

измењених датотека: 1, додавања: 21(+), брисања: 21(-)
diff --git a/table.c b/table.c
@@ -11,38 +11,38 @@
 #include "defs.h"
 #include "version.h"
 
-#define CHECKEXITNOMEM(ptr) { if (!ptr) exit(error(ENOMEM, \
-				"Memory allocation failed (out of memory?)")); }
+#define CHECKEXITNOMEM(ptr) do { if (!ptr) exit(error(ENOMEM, \
+				"Memory allocation failed (out of memory?)")); } while (0)
 
-#define CALLOC(ptr, ptrtype, nmemb) { ptr = calloc(nmemb, sizeof(ptrtype)); \
-	CHECKEXITNOMEM(ptr) }
+#define CALLOC(ptr, ptrtype, nmemb) do { ptr = calloc(nmemb, sizeof(ptrtype)); \
+	CHECKEXITNOMEM(ptr); } while (0)
 
-#define REALLOC(ptr, ptrtype, newsize) { ptrtype* newptr = realloc(ptr, newsize); \
-	CHECKEXITNOMEM(newptr) \
-	ptr = newptr; }
+#define REALLOC(ptr, ptrtype, newsize) do { ptrtype* newptr = realloc(ptr, newsize); \
+	CHECKEXITNOMEM(newptr); \
+	ptr = newptr; } while (0)
 
 #define REALLOCARRAY(ptr, membtype, newcount) \
-	REALLOC(ptr, membtype, sizeof(membtype) * newcount)
+	REALLOC(ptr, membtype, sizeof(membtype) * newcount);
 
-#define CHECKCOPY(token, ptoken, token_size, parg) { \
+#define CHECKCOPY(token, ptoken, token_size, parg) do { \
 	if (ptoken + 2 > token + token_size) \
 	{ \
 		size_t old_size = token_size; \
 		token_size += BUFSIZE; \
-		REALLOC(token, char, token_size) \
+		REALLOC(token, char, token_size); \
 		ptoken = token + old_size - 1; \
 	} \
-	*ptoken++ = *parg++; }
+	*ptoken++ = *parg++; } while (0)
 
-#define CHECKSET(format, pformat, format_size, num) { \
+#define CHECKSET(format, pformat, format_size, num) do { \
 	if (pformat + 2 > format + format_size) \
 	{ \
 		size_t old_size = format_size; \
 		format_size += BUFSIZE; \
-		REALLOC(format, ULONG, format_size) \
+		REALLOC(format, ULONG, format_size); \
 		pformat = format + old_size - 1; \
 	} \
-	*pformat++ = num; }
+	*pformat++ = num; } while (0)
 
 size_t colno                 = 0;
 size_t lineno                = 0;
@@ -102,7 +102,7 @@ substr(const char* src, int start, int finish)
 	if (substr_len < 0)
 		substr_len = 0;
 	char* result = NULL;
-	CALLOC(result, char, substr_len+1)
+	CALLOC(result, char, substr_len+1);
 	char* presult = result;
 	for (int i = start; i < finish && *(src+i) != '\0'; i++)
 		*presult++ = *(src+i);
@@ -203,10 +203,10 @@ set_format(const char* arg, ULONG** format, size_t* format_size)
 	char* ptoken      = NULL;
 	ULONG num;
 
-	CALLOC(token, char, token_size)
+	CALLOC(token, char, token_size);
 	ptoken = token;
 	*format_size = SMALL_BUFSIZE;
-	CALLOC(*format, ULONG, *format_size)
+	CALLOC(*format, ULONG, *format_size);
 	pformat = *format;
 
 	while (*parg)
@@ -237,13 +237,13 @@ set_format(const char* arg, ULONG** format, size_t* format_size)
 				*format = NULL;
 				return 3;
 			}
-			CHECKSET(*format, pformat, *format_size, num)
+			CHECKSET(*format, pformat, *format_size, num);
 			*token = 0;
 			ptoken = token;
 			parg++;
 		}
 		else
-			CHECKCOPY(token, ptoken, token_size, parg)
+			CHECKCOPY(token, ptoken, token_size, parg);
 	}
 	if (*token)
 	{
@@ -257,7 +257,7 @@ set_format(const char* arg, ULONG** format, size_t* format_size)
 			*format = NULL;
 			return 3;
 		}
-		CHECKSET(*format, pformat, *format_size, num)
+		CHECKSET(*format, pformat, *format_size, num);
 	}
 
 	free(token);
@@ -469,7 +469,7 @@ main(int argc, char** argv)
 	size_t output_lines = 0;
 	size_t column_start = 0;
 
-	CALLOC(line, u8, BUFSIZE)
+	CALLOC(line, u8, BUFSIZE);
 
 	while (!feof(input))
 	{