Use format strings directly to prevent -Werror=format-security failures

[tools/e2fsprogs.git] / lib / ss / ss.h

diff --git a/lib/ss/ss.h b/lib/ss/ss.h
index 805e1f1..6cc050b 100644 (file)
--- a/lib/ss/ss.h
+++ b/lib/ss/ss.h
@@ -25,14 +25,16 @@
 
 #include <ss/ss_err.h>
 
-#ifdef __STDC__
 #define __SS_CONST const
 #define __SS_PROTO (int, const char * const *, int, void *)
+
+#ifdef __GNUC__
+#define __SS_ATTR(x) __attribute__(x)
 #else
-#define __SS_CONST
-#define __SS_PROTO ()
+#define __SS_ATTR(x)
 #endif
 
+
 typedef __SS_CONST struct _ss_request_entry {
     __SS_CONST char * __SS_CONST *command_names; /* whatever */
     void (* __SS_CONST function) __SS_PROTO; /* foo */
@@ -63,10 +65,12 @@ void ss_help __SS_PROTO;
 #if 0
 char *ss_current_request();    /* This is actually a macro */
 #endif
-#ifdef __STDC__
+
 char *ss_name(int sci_idx);
-void ss_error (int, long, char const *, ...);
+void ss_error (int, long, char const *, ...)
+       __SS_ATTR((format(printf, 3, 4)));
 void ss_perror (int, long, char const *);
+
 int ss_create_invocation(const char *, const char *, void *,
                         ss_request_table *, int *);
 void ss_delete_invocation(int);
@@ -86,25 +90,6 @@ void ss_unimplemented(int argc, const char * const *argv,
 void ss_set_prompt(int sci_idx, char *new_prompt);
 char *ss_get_prompt(int sci_idx);
 void ss_get_readline(int sci_idx);
-#else
-char *ss_name();
-void ss_error ();
-void ss_perror ();
-int ss_create_invocation();
-void ss_delete_invocation();
-int ss_listen();
-int ss_execute_line();
-void ss_add_request_table();
-void ss_delete_request_table();
-void ss_abort_subsystem();
-void ss_quit();
-void ss_self_identify();
-void ss_subsystem_name();
-void ss_subsystem_version();
-void ss_unimplemented();
-void ss_set_prompt;
-char *ss_get_prompt;
-void ss_get_readline();
-#endif
+
 extern ss_request_table ss_std_requests;
 #endif /* _ss_h */