From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 15 Jul 2025 14:57:51 +0000 (+0100)
Subject: Fix error handling of unknown information
X-Git-Tag: archive/debian/8.0.1~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=ae8424f33733e86bdcd57f18373cdec6acd97ce4;p=chiark-utils.git

Fix error handling of unknown information

Previously, these lost errors would cause the unknown USB enum type to
make us stop working at all.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/cprogs/xbatmon-simple.c b/cprogs/xbatmon-simple.c
index 3ce1d57..8dc6793 100644
--- a/cprogs/xbatmon-simple.c
+++ b/cprogs/xbatmon-simple.c
@@ -247,7 +247,7 @@ static int parse_value(const fileinfo *cfile, const batinfo_field *field) {
     char *ep;
     *field->valuep= strtoull(batlinevalue,&ep,10);
     if (*ep)
-      batfailf("value number syntax incorrect");
+      return batfailf("value number syntax incorrect");
 
   } else {
 	
@@ -256,7 +256,7 @@ static int parse_value(const fileinfo *cfile, const batinfo_field *field) {
 	 *enumsearch && strcmp(*enumsearch,batlinevalue);
 	 (*field->valuep)++, enumsearch++);
     if (!*enumsearch)
-      batfailf("unknown enum value");
+      return batfailf("unknown enum value");
 
   }
   return 0;