style cleanup: whitespace, bli & makesdna

1 files changed, 44 insertions, 44 deletions

diff --git a/source/blender/blenlib/intern/BLI_dynstr.c b/source/blender/blenlib/intern/BLI_dynstr.c
index 54d9bc5f16d..d1c30504153 100644
--- a/source/blender/blenlib/intern/BLI_dynstr.c
+++ b/source/blender/blenlib/intern/BLI_dynstr.c
@@ -46,9 +46,9 @@
 
 #ifndef va_copy
 # ifdef __va_copy
-#  define va_copy(a,b) __va_copy(a,b)
+#  define va_copy(a, b) __va_copy(a, b)
 # else /* !__va_copy */
-#  define va_copy(a,b) ((a)=(b))
+#  define va_copy(a, b) ((a) = (b))
 # endif /* __va_copy */
 #endif /* va_copy */
 
@@ -70,65 +70,65 @@ struct DynStr {
 
 DynStr *BLI_dynstr_new(void)
 {
-	DynStr *ds= MEM_mallocN(sizeof(*ds), "DynStr");
-	ds->elems= ds->last= NULL;
-	ds->curlen= 0;
+	DynStr *ds = MEM_mallocN(sizeof(*ds), "DynStr");
+	ds->elems = ds->last = NULL;
+	ds->curlen = 0;
 	
 	return ds;
 }
 
 void BLI_dynstr_append(DynStr *ds, const char *cstr)
 {
-	DynStrElem *dse= malloc(sizeof(*dse));
-	int cstrlen= strlen(cstr);
+	DynStrElem *dse = malloc(sizeof(*dse));
+	int cstrlen = strlen(cstr);
 	
-	dse->str= malloc(cstrlen+1);
-	memcpy(dse->str, cstr, cstrlen+1);
-	dse->next= NULL;
+	dse->str = malloc(cstrlen + 1);
+	memcpy(dse->str, cstr, cstrlen + 1);
+	dse->next = NULL;
 	
 	if (!ds->last)
-		ds->last= ds->elems= dse;
+		ds->last = ds->elems = dse;
 	else
-		ds->last= ds->last->next= dse;
+		ds->last = ds->last->next = dse;
 
-	ds->curlen+= cstrlen;
+	ds->curlen += cstrlen;
 }
 
 void BLI_dynstr_nappend(DynStr *ds, const char *cstr, int len)
 {
-	DynStrElem *dse= malloc(sizeof(*dse));
-	int cstrlen= BLI_strnlen(cstr, len);
+	DynStrElem *dse = malloc(sizeof(*dse));
+	int cstrlen = BLI_strnlen(cstr, len);
 
-	dse->str= malloc(cstrlen+1);
+	dse->str = malloc(cstrlen + 1);
 	memcpy(dse->str, cstr, cstrlen);
 	dse->str[cstrlen] = '\0';
-	dse->next= NULL;
+	dse->next = NULL;
 
 	if (!ds->last)
-		ds->last= ds->elems= dse;
+		ds->last = ds->elems = dse;
 	else
-		ds->last= ds->last->next= dse;
+		ds->last = ds->last->next = dse;
 
-	ds->curlen+= cstrlen;
+	ds->curlen += cstrlen;
 }
 
 void BLI_dynstr_vappendf(DynStr *ds, const char *format, va_list args)
 {
 	char *message, fixedmessage[256];
-	int len= sizeof(fixedmessage);
-	const int maxlen= 65536;
+	int len = sizeof(fixedmessage);
+	const int maxlen = 65536;
 	int retval;
 
 	while (1) {
 		va_list args_cpy;
 		if (len == sizeof(fixedmessage))
-			message= fixedmessage;
+			message = fixedmessage;
 		else
-			message= MEM_callocN(sizeof(char) * len, "BLI_dynstr_appendf");
+			message = MEM_callocN(sizeof(char) * len, "BLI_dynstr_appendf");
 
 		/* cant reuse the same args, so work on a copy */
 		va_copy(args_cpy, args);
-		retval= vsnprintf(message, len, format, args_cpy);
+		retval = vsnprintf(message, len, format, args_cpy);
 		va_end(args_cpy);
 
 		if (retval == -1) {
@@ -136,7 +136,7 @@ void BLI_dynstr_vappendf(DynStr *ds, const char *format, va_list args)
 			 * there is a formatting error, so we impose a maximum length */
 			if (message != fixedmessage)
 				MEM_freeN(message);
-			message= NULL;
+			message = NULL;
 
 			len *= 2;
 			if (len > maxlen) {
@@ -148,10 +148,10 @@ void BLI_dynstr_vappendf(DynStr *ds, const char *format, va_list args)
 			/* in C99 the actual length required is returned */
 			if (message != fixedmessage)
 				MEM_freeN(message);
-			message= NULL;
+			message = NULL;
 
 			/* retval doesn't include \0 terminator */
-			len= retval + 1;
+			len = retval + 1;
 		}
 		else
 			break;
@@ -169,8 +169,8 @@ void BLI_dynstr_appendf(DynStr *ds, const char *format, ...)
 {
 	va_list args;
 	char *message, fixedmessage[256];
-	int len= sizeof(fixedmessage);
-	const int maxlen= 65536;
+	int len = sizeof(fixedmessage);
+	const int maxlen = 65536;
 	int retval;
 
 	/* note that it's tempting to just call BLI_dynstr_vappendf here
@@ -179,12 +179,12 @@ void BLI_dynstr_appendf(DynStr *ds, const char *format, ...)
 
 	while (1) {
 		if (len == sizeof(fixedmessage))
-			message= fixedmessage;
+			message = fixedmessage;
 		else
-			message= MEM_callocN(sizeof(char)*(len), "BLI_dynstr_appendf");
+			message = MEM_callocN(sizeof(char) * (len), "BLI_dynstr_appendf");
 
 		va_start(args, format);
-		retval= vsnprintf(message, len, format, args);
+		retval = vsnprintf(message, len, format, args);
 		va_end(args);
 
 		if (retval == -1) {
@@ -192,7 +192,7 @@ void BLI_dynstr_appendf(DynStr *ds, const char *format, ...)
 			 * there is a formatting error, so we impose a maximum length */
 			if (message != fixedmessage)
 				MEM_freeN(message);
-			message= NULL;
+			message = NULL;
 
 			len *= 2;
 			if (len > maxlen) {
@@ -204,10 +204,10 @@ void BLI_dynstr_appendf(DynStr *ds, const char *format, ...)
 			/* in C99 the actual length required is returned */
 			if (message != fixedmessage)
 				MEM_freeN(message);
-			message= NULL;
+			message = NULL;
 
 			/* retval doesn't include \0 terminator */
-			len= retval + 1;
+			len = retval + 1;
 		}
 		else
 			break;
@@ -231,19 +231,19 @@ void BLI_dynstr_get_cstring_ex(DynStr *ds, char *rets)
 	char *s;
 	DynStrElem *dse;
 
-	for (s= rets, dse= ds->elems; dse; dse= dse->next) {
-		int slen= strlen(dse->str);
+	for (s = rets, dse = ds->elems; dse; dse = dse->next) {
+		int slen = strlen(dse->str);
 
 		memcpy(s, dse->str, slen);
 
-		s+= slen;
+		s += slen;
 	}
-	rets[ds->curlen]= '\0';
+	rets[ds->curlen] = '\0';
 }
 
 char *BLI_dynstr_get_cstring(DynStr *ds)
 {
-	char *rets= MEM_mallocN(ds->curlen+1, "dynstr_cstring");
+	char *rets = MEM_mallocN(ds->curlen + 1, "dynstr_cstring");
 	BLI_dynstr_get_cstring_ex(ds, rets);
 	return rets;
 }
@@ -252,13 +252,13 @@ void BLI_dynstr_free(DynStr *ds)
 {
 	DynStrElem *dse;
 	
-	for (dse= ds->elems; dse; ) {
-		DynStrElem *n= dse->next;
+	for (dse = ds->elems; dse; ) {
+		DynStrElem *n = dse->next;
 		
 		free(dse->str);
 		free(dse);
 		
-		dse= n;
+		dse = n;
 	}
 	
 	MEM_freeN(ds);