[med-svn] [aghermann] 04/60: heed some -Wformat

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch WIP
in repository aghermann.

commit a38e2a734447031e44c571cef4fe68c10321d3bb
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Mon Sep 30 09:27:18 2013 +0300

    heed some -Wformat
---
 upstream/src/common/log-facility.cc     |    2 +-
 upstream/src/common/log-facility.hh     |    2 +-
 upstream/src/libsigfile/typed-source.cc |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/upstream/src/common/log-facility.cc b/upstream/src/common/log-facility.cc
index f9fa6f6..3b21f17 100644
--- a/upstream/src/common/log-facility.cc
+++ b/upstream/src/common/log-facility.cc
@@ -123,7 +123,7 @@ vmsg( TLevel this_level, const char *issuer, const char* fmt, va_list ap)
                                 fprintf( _f,
                                          "%s %s %+*d %s\n",
                                          timestampbuf, level_s(this_level),
-                                         strlen(issuer), mline,
+                                         (int)strlen(issuer), mline,
                                          line);
                         else
                                 fprintf( _f,
diff --git a/upstream/src/common/log-facility.hh b/upstream/src/common/log-facility.hh
index 07f9efd..e8e939f 100644
--- a/upstream/src/common/log-facility.hh
+++ b/upstream/src/common/log-facility.hh
@@ -64,7 +64,7 @@ struct SLoggingClient {
         void log( agh::log::TLevel, const char* issuer, const char* fmt, ...) __attribute__ ((format (printf, 4, 5)));
 };
 
-#define LOG_SOURCE_ISSUER agh::str::sasprintf("%s:%zu:", __FILE__, __LINE__).c_str()
+#define LOG_SOURCE_ISSUER agh::str::sasprintf("%s:%d:", __FILE__, __LINE__).c_str()
 
 #define LOG_DEBUG(...) do this->log( agh::log::TLevel::debug,   LOG_SOURCE_ISSUER, __VA_ARGS__); while (0)
 #define LOG_INFO(...)  do this->log( agh::log::TLevel::info,    LOG_SOURCE_ISSUER, __VA_ARGS__); while (0)
diff --git a/upstream/src/libsigfile/typed-source.cc b/upstream/src/libsigfile/typed-source.cc
index e70f1cb..6cb9f0e 100644
--- a/upstream/src/libsigfile/typed-source.cc
+++ b/upstream/src/libsigfile/typed-source.cc
@@ -73,7 +73,7 @@ CTypedSource (const string& fname,
                 if ( CHypnogram::n_pages() != scorable_pages ) {
                         if ( CHypnogram::n_pages() > 0 && log_facility )
                                 log_facility->msg(
-                                        agh::log::TLevel::warning, agh::str::sasprintf("%s:%zu", __FILE__, __LINE__).c_str(),
+                                        agh::log::TLevel::warning, agh::str::sasprintf("%s:%d", __FILE__, __LINE__).c_str(),
                                         "CSource(\"%s\"): number of scorable pages @pagesize=%zu (%g / %zu = %zu) "
                                         "differs from the number read from hypnogram file (%zu); adjusting hypnogram size",
                                         fname.c_str(), pagesize, _obj->recording_time(), pagesize, scorable_pages, CHypnogram::n_pages());

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git