[med-svn] [aghermann] 06/31: ICM and suchlike

[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 ab53af4b2900c56ecd43eb542cc6859b97365889
Author: andrei zavada <hmmr at fa2>
Date:   Fri Nov 8 19:37:08 2013 +0200

    ICM and suchlike
---
 upstream/src/aghermann/expdesign/expdesign.cc |    6 ++----
 upstream/src/aghermann/patterns/patterns.cc   |    3 ++-
 upstream/src/aghermann/rk1968/rk1968.cc       |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/upstream/src/aghermann/expdesign/expdesign.cc b/upstream/src/aghermann/expdesign/expdesign.cc
index 4e9617d..880aeb3 100644
--- a/upstream/src/aghermann/expdesign/expdesign.cc
+++ b/upstream/src/aghermann/expdesign/expdesign.cc
@@ -187,8 +187,7 @@ make_dirname( TExpDirLevel level, const SExpDirLevelId& level_id) const
         case TExpDirLevel::transient:
                 return "/tmp";
 
-        case TExpDirLevel::session:
-        {
+        case TExpDirLevel::session: {
                 TJGroups::const_iterator Gi;
                 const CSubject& J = subject_by_x(level_id.j, &Gi);
                 if ( level_id.g != Gi->first || !J.have_session(level_id.d) )
@@ -196,8 +195,7 @@ make_dirname( TExpDirLevel level, const SExpDirLevelId& level_id) const
                 return move(str::sasprintf( "%s/%s/%s/%s", _session_dir.c_str(), Gi->first.c_str(), J.id.c_str(), level_id.d.c_str()));
         }
 
-        case TExpDirLevel::subject:
-        {
+        case TExpDirLevel::subject: {
                 TJGroups::const_iterator Gi;
                 const CSubject& J = subject_by_x(level_id.j, &Gi);
                 if ( level_id.g != Gi->first )
diff --git a/upstream/src/aghermann/patterns/patterns.cc b/upstream/src/aghermann/patterns/patterns.cc
index fa6b8f1..4adb42e 100644
--- a/upstream/src/aghermann/patterns/patterns.cc
+++ b/upstream/src/aghermann/patterns/patterns.cc
@@ -15,6 +15,7 @@
 #include <sys/stat.h>
 
 #include "common/fs.hh"
+#include "aghermann/globals.hh"
 #include "aghermann/expdesign/expdesign.hh"
 #include "patterns.hh"
 
@@ -44,7 +45,7 @@ save()
                 return 0;
 
         if ( thing.size() == 0 ) {
-                fprintf( stderr, "save_pattern(\"%s\"): thing is empty\n", path().c_str());
+                APPLOG_WARN ("save_pattern(\"%s\"): thing is empty", path().c_str());
                 return -1;
         }
 
diff --git a/upstream/src/aghermann/rk1968/rk1968.cc b/upstream/src/aghermann/rk1968/rk1968.cc
index 637ce5f..1972dcb 100644
--- a/upstream/src/aghermann/rk1968/rk1968.cc
+++ b/upstream/src/aghermann/rk1968/rk1968.cc
@@ -294,7 +294,7 @@ host_get_data( lua_State *L)
                                 : R.swu_profile.course( fa);
                         auto p = pa;
                         if ( !lua_checkstack( L, pz - pa) )
-                                make_error_return( "Failed to grow stack for %zu numbers", pz - pa);
+                                make_error_return( "Failed to grow stack for %d numbers", pz - pa);
 
                         while ( p <= pz )
                                 lua_pushnumber( L, C[p++]);

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