Author: kib
Date: Sat Feb 12 12:46:00 2011
New Revision: 218601
URL: http://svn.freebsd.org/changeset/base/218601
Log:
Replace ERROR() macro with inline function. In-tree gcc cannot tolerate
the construct like printf("%\s", NULL) resulting from macroexpand of
ERROR(u, NULL), making it impossible to use LIBUFS_DEBUGGING.
With inline function, compiler cannot detect the NULL argument to
known function and does not try to convert it into puts().
In collaboration with: pho
Modified:
head/lib/libufs/libufs.h
Modified: head/lib/libufs/libufs.h
==============================================================================
--- head/lib/libufs/libufs.h Sat Feb 12 11:00:34 2011 (r218600)
+++ head/lib/libufs/libufs.h Sat Feb 12 12:46:00 2011 (r218601)
@@ -31,34 +31,6 @@
#define __LIBUFS_H__
/*
- * libufs macros (internal, non-exported).
- */
-#ifdef _LIBUFS
-#ifdef _LIBUFS_DEBUGGING
-/*
- * Trace steps through libufs, to be used at entry and erroneous return.
- */
-#define ERROR(uufsd, str) \
-do { \
- fprintf(stderr, "libufs in %s", __func__); \
- if (str != NULL) \
- fprintf(stderr, ": %s", str); \
- if (errno) \
- fprintf(stderr, ": %s", strerror(errno)); \
- fprintf(stderr, "\n"); \
- if ((uufsd) != NULL) \
- (uufsd)->d_error = str; \
-} while (0)
-#else /* _LIBUFS_DEBUGGING */
-#define ERROR(uufsd, str) \
-do { \
- if ((uufsd) != NULL) \
- (uufsd)->d_error = str; \
-} while (0)
-#endif /* _LIBUFS_DEBUGGING */
-#endif /* _LIBUFS */
-
-/*
* libufs structures.
*/
@@ -94,6 +66,30 @@ struct uufsd {
#define d_cg d_cgunion.d_cg
};
+/*
+ * libufs macros (internal, non-exported).
+ */
+#ifdef _LIBUFS
+/*
+ * Trace steps through libufs, to be used at entry and erroneous return.
+ */
+static inline void
+ERROR(struct uufsd *u, const char *str)
+{
+
+#ifdef _LIBUFS_DEBUGGING
+ if (str != NULL) {
+ fprintf(stderr, "libufs: %s", str);
+ if (errno != 0)
+ fprintf(stderr, ": %s", strerror(errno));
+ fprintf(stderr, "\n");
+ }
+#endif
+ if (u != NULL)
+ u->d_error = str;
+}
+#endif /* _LIBUFS */
+
__BEGIN_DECLS
/*
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
