[PATCH] klibc_fixups: remove unneeded stuff

[elogind.git] / libsysfs / sysfs.h

diff --git a/libsysfs/sysfs.h b/libsysfs/sysfs.h
index 4ea4919351782c1ddc4818934737477c903efc0d..838427797dda5570cc567cefe89a560c117d0377 100644 (file)
--- a/libsysfs/sysfs.h
+++ b/libsysfs/sysfs.h
@@ -27,24 +27,38 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <ctype.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 
+#define safestrcpy(to, from)   strncpy(to, from, sizeof(to)-1)
+#define safestrcat(to, from)   strncat(to, from, sizeof(to) - strlen(to)-1)
+
+#define safestrcpymax(to, from, max) \
+do { \
+       to[max-1] = '\0'; \
+       strncpy(to, from, max-1); \
+} while (0)
+
+#define safestrcatmax(to, from, max) \
+do { \
+       to[max-1] = '\0'; \
+       strncat(to, from, max - strlen(to)-1); \
+} while (0)
+
+extern struct sysfs_attribute *get_attribute(void *dev, const char *name);
+extern struct dlist *read_dir_subdirs(const char *path);
+extern struct dlist *read_dir_links(const char *path);
+extern struct dlist *get_attributes_list(void *dev);
+
 /* Debugging */
 #ifdef DEBUG
-#include <syslog.h>
-#define dprintf(format, arg...)                                                                \
-       do {                                                                            \
-               log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);        \
-       } while (0)
+#include "../logging.h"
+#define dprintf(format, arg...) dbg(format, ## arg)
 #else
 #define dprintf(format, arg...) do { } while (0)
 #endif
 
-extern int log_message (int level, const char *format, ...)
-       __attribute__ ((format (printf, 2, 3)));
-
-
 #endif /* _SYSFS_H_ */