- allow compiler to check format strings

diff --git a/client/snapper.cc b/client/snapper.cc
index 46240068a819a762d40bd7cfa194e635b0b8b3ce..842bf6c9853f99e71bcb2aff3b9bb257d7ce998c 100644 (file)
--- a/client/snapper.cc
+++ b/client/snapper.cc
@@ -807,7 +807,7 @@ help_delete()
 void
 filter_undeletables(ProxySnapshots& snapshots, vector<ProxySnapshots::iterator>& nums)
 {
-    auto filter = [&snapshots, &nums](ProxySnapshots::const_iterator undeletable, const string& message)
+    auto filter = [&snapshots, &nums](ProxySnapshots::const_iterator undeletable, const char* message)
     {
        if (undeletable == snapshots.end())
            return;

diff --git a/client/utils/text.cc b/client/utils/text.cc
index e454110a0664208c33aeb89452b860f6c99986c5..8610071d77e77b52c5ecf761c5aab98508dc66ac 100644 (file)
--- a/client/utils/text.cc
+++ b/client/utils/text.cc
@@ -14,12 +14,16 @@
 
 using namespace std;
 
-string _(const char* msgid)
+
+const char*
+_(const char* msgid)
 {
     return dgettext("snapper", msgid);
 }
 
-string _(const char* msgid, const char* msgid_plural, unsigned long int n)
+
+const char*
+_(const char* msgid, const char* msgid_plural, unsigned long int n)
 {
     return dngettext("snapper", msgid, msgid_plural, n);
 }

diff --git a/client/utils/text.h b/client/utils/text.h
index d1f4d5737a56a956ea0d788b0596c35f45abeb1e..9e055f8b3a4a07d3a21b7cc2ff181554a03334b0 100644 (file)
--- a/client/utils/text.h
+++ b/client/utils/text.h
@@ -11,8 +11,10 @@
 #include <string>
 #include <iosfwd>
 
-std::string _(const char* msgid);
-std::string _(const char* msgid, const char* msgid_plural, unsigned long int n);
+const char* _(const char* msgid) __attribute__ ((format_arg(1)));
+
+const char* _(const char* msgid, const char* msgid_plural, unsigned long int n)
+    __attribute__ ((format_arg(1))) __attribute__ ((format_arg(2)));
 
 /** Returns the column width of a multi-byte character string \a str */
 unsigned mbs_width (const std::string & str);

diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
index 052235d5e63748bc32646613530324034199d853..1d8fb96729968567a142bbc6744ba8c59f0b3bdc 100644 (file)
--- a/snapper/AppUtil.cc
+++ b/snapper/AppUtil.cc
@@ -237,14 +237,14 @@ namespace snapper
 
 
     string
-    sformat(const string& format, ...)
+    sformat(const char* format, ...)
     {
        char* result;
        string str;
 
        va_list ap;
        va_start(ap, format);
-       if (vasprintf(&result, format.c_str(), ap) != -1)
+       if (vasprintf(&result, format, ap) != -1)
        {
            str = result;
            free(result);

diff --git a/snapper/AppUtil.h b/snapper/AppUtil.h
index d2211e7760fca76c2c0b0152672d35ed3719b5ad..75947a10ac19233c639e46d4fe0d576580aacce1 100644 (file)
--- a/snapper/AppUtil.h
+++ b/snapper/AppUtil.h
@@ -111,7 +111,7 @@ namespace snapper
     };
 
 
-    string sformat(const string& format, ...);
+    string sformat(const char* format, ...) __attribute__ ((format(printf, 1, 2)));
 
 
     struct runtime_error_with_errno : public std::runtime_error