[uClibc-cvs] svn commit: trunk/uClibc/ldso/include

vapier at uclibc.org vapier at uclibc.org
Sat Jun 25 08:34:43 UTC 2005


Author: vapier
Date: 2005-06-25 02:34:42 -0600 (Sat, 25 Jun 2005)
New Revision: 10591

Log:
whitespace/syntax cleanups

Modified:
   trunk/uClibc/ldso/include/dl-string.h


Changeset:
Modified: trunk/uClibc/ldso/include/dl-string.h
===================================================================
--- trunk/uClibc/ldso/include/dl-string.h	2005-06-25 08:28:09 UTC (rev 10590)
+++ trunk/uClibc/ldso/include/dl-string.h	2005-06-25 08:34:42 UTC (rev 10591)
@@ -261,63 +261,64 @@
  * disable the whole lot... */
 #if defined(__mips__)
 
-#define SEND_STDERR(X)
-#define SEND_ADDRESS_STDERR(X, add_a_newline)
-#define SEND_NUMBER_STDERR(X, add_a_newline)
+# define SEND_STDERR(X)
+# define SEND_ADDRESS_STDERR(X, add_a_newline)
+# define SEND_NUMBER_STDERR(X, add_a_newline)
 
 #else
 
 /* On some arches constant strings are referenced through the GOT.
  * This requires that load_addr must already be defined... */
 #if defined(mc68000) || defined(__arm__) || defined(__mips__)	\
-		     || defined(__sh__) ||  defined(__powerpc__)
-#   define CONSTANT_STRING_GOT_FIXUP(X)				\
-	    if ((X) < (const char *) load_addr) (X) += load_addr
+                     || defined(__sh__) ||  defined(__powerpc__)
+# define CONSTANT_STRING_GOT_FIXUP(X) \
+	if ((X) < (const char *) load_addr) (X) += load_addr
 #else
-#   define CONSTANT_STRING_GOT_FIXUP(X)
+# define CONSTANT_STRING_GOT_FIXUP(X)
 #endif
 
-
-#define SEND_STDERR(X) {					\
-    const char *tmp1 = (X);					\
-    CONSTANT_STRING_GOT_FIXUP(tmp1);				\
-    _dl_write (2, tmp1, _dl_strlen(tmp1));			\
+#define SEND_STDERR(X) \
+{ \
+	const char *tmp1 = (X); \
+	CONSTANT_STRING_GOT_FIXUP(tmp1); \
+	_dl_write(2, tmp1, _dl_strlen(tmp1)); \
 };
 
-#define SEND_ADDRESS_STDERR(ADR, add_a_newline) {		\
-    char tmp[26], v, *tmp2, *tmp1 = tmp;			\
-    unsigned long X = (unsigned long)(ADR);			\
-    CONSTANT_STRING_GOT_FIXUP(tmp1);				\
-    tmp2 = tmp1 + sizeof(tmp);					\
-    *--tmp2 = '\0';						\
-    if (add_a_newline) *--tmp2 = '\n';				\
-    do {							\
-	    v = (X) & 0xf;					\
-	    if (v <= 0x09)					\
-		*--tmp2 = '0' + v;				\
-	    else						\
-		*--tmp2 = 'a' - 0x0a + v;			\
-	    (X) >>= 4;						\
-    } while ((X) > 0);						\
-    *--tmp2 = 'x';						\
-    *--tmp2 = '0';						\
-    _dl_write (2, tmp2, tmp1 - tmp2 + sizeof(tmp) - 1);		\
-};
+#define SEND_ADDRESS_STDERR(ADR, add_a_newline) \
+{ \
+	char tmp[26], v, *tmp2, *tmp1 = tmp; \
+	unsigned long X = (unsigned long)(ADR); \
+	CONSTANT_STRING_GOT_FIXUP(tmp1); \
+	tmp2 = tmp1 + sizeof(tmp); \
+	*--tmp2 = '\0'; \
+	if (add_a_newline) *--tmp2 = '\n'; \
+	do { \
+		v = (X) & 0xf; \
+		if (v <= 0x09) \
+			*--tmp2 = '0' + v; \
+		else \
+			*--tmp2 = 'a' - 0x0a + v; \
+		(X) >>= 4; \
+	} while ((X) > 0); \
+	*--tmp2 = 'x'; \
+	*--tmp2 = '0'; \
+	_dl_write(2, tmp2, tmp1 - tmp2 + sizeof(tmp) - 1); \
+}
 
-#define SEND_NUMBER_STDERR(X, add_a_newline) {			\
-    char tmp[26], v, *tmp2, *tmp1 = tmp;			\
-    CONSTANT_STRING_GOT_FIXUP(tmp1);				\
-    tmp2 = tmp1 + sizeof(tmp);					\
-    *--tmp2 = '\0';						\
-    if (add_a_newline) *--tmp2 = '\n';				\
-    do {							\
-	do_rem(v, (X), 10);					\
-	*--tmp2 = '0' + v;					\
-	(X) /= 10;						\
-    } while ((X) > 0);						\
-    _dl_write (2, tmp2, tmp1 - tmp2 + sizeof(tmp) - 1);		\
-};
+#define SEND_NUMBER_STDERR(X, add_a_newline) \
+{ \
+	char tmp[26], v, *tmp2, *tmp1 = tmp; \
+	CONSTANT_STRING_GOT_FIXUP(tmp1); \
+	tmp2 = tmp1 + sizeof(tmp); \
+	*--tmp2 = '\0'; \
+	if (add_a_newline) *--tmp2 = '\n'; \
+	do { \
+		do_rem(v, (X), 10); \
+		*--tmp2 = '0' + v; \
+		(X) /= 10; \
+	} while ((X) > 0); \
+	_dl_write(2, tmp2, tmp1 - tmp2 + sizeof(tmp) - 1); \
+}
 #endif
 
-
 #endif




More information about the uClibc-cvs mailing list