[med-svn] [aghermann] 06/23: patterns: more accurate sscanf to unbreak load()

[andrei zavada]

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

hmmr-guest pushed a commit to tag 1.1.2
in repository aghermann.

commit f7cacc4b977cf4bea59e51bb1f6608dda3ffbe21
Author: Andrei Zavada <hmmr at frdg>
Date:   Tue Jan 3 05:39:13 2017 +0200

    patterns: more accurate sscanf to unbreak load()
---
 upstream/src/aghermann/patterns/patterns.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/upstream/src/aghermann/patterns/patterns.cc b/upstream/src/aghermann/patterns/patterns.cc
index 44ad74f..fc77de8 100644
--- a/upstream/src/aghermann/patterns/patterns.cc
+++ b/upstream/src/aghermann/patterns/patterns.cc
@@ -126,8 +126,7 @@ load()
                 double  t1, t2, t3, t4;
                 if ( 15 != fscanf(
                              fd,
-                             "%lg  %u %lg %lg  %lg %lg %u"
-                             " %lg %lg %lg %lg"
+                             "%lg  %u %lg %lg  %lg %lg %u  %lg %lg %lg %lg\n"
                              " %zu %zu %zu %zu\n"
                              "--DATA--\n",
                              &Pp.env_scope,
@@ -175,7 +174,7 @@ load()
                 else
                         fprintf( stderr, "load_pattern(\"%s\"): tried, but failed, to rename as *~\n", fname);
 
-                return -2;
+                throw;
         }
 }
 
@@ -237,7 +236,5 @@ SPattern (const string& name_, TExpDirLevel level_, CExpDesign& ED_, const SExpD
 }
 
 
-
-
 }
 } // namespace agh::pattern

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