From 80504b21fe322bb4f423225decbc781c8c8e7395 Mon Sep 17 00:00:00 2001 From: Patrick Brosi Date: Tue, 2 Jan 2024 16:26:07 +0100 Subject: [PATCH] use int instead of char to hold return value of getopt_long to avoid issues if the default char is unsigned (arm64), update util and cppgtfs to fix further issues on such architectures --- src/cppgtfs | 2 +- src/pfaedle/config/ConfigReader.cpp | 2 +- src/util | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cppgtfs b/src/cppgtfs index a54cfcb..0a3bbd6 160000 --- a/src/cppgtfs +++ b/src/cppgtfs @@ -1 +1 @@ -Subproject commit a54cfcb3bde79ac6ac74f7eb816f89d4b58ad05a +Subproject commit 0a3bbd657ae0c18a3ce1a2e8ef370953cdcdff01 diff --git a/src/pfaedle/config/ConfigReader.cpp b/src/pfaedle/config/ConfigReader.cpp index 53baf60..d3acdd7 100644 --- a/src/pfaedle/config/ConfigReader.cpp +++ b/src/pfaedle/config/ConfigReader.cpp @@ -147,7 +147,7 @@ void ConfigReader::read(Config* cfg, int argc, char** argv) { {"keep-additional-gtfs-fields", no_argument, 0, 'F'}, {0, 0, 0, 0}}; - char c; + int c; while ((c = getopt_long(argc, argv, ":o:hvi:c:x:Dm:g:X:T:d:pP:F", ops, 0)) != -1) { switch (c) { diff --git a/src/util b/src/util index 916da8c..d1c30e9 160000 --- a/src/util +++ b/src/util @@ -1 +1 @@ -Subproject commit 916da8c37d292bf0d75ede97c52c480454f7d768 +Subproject commit d1c30e9ec4cb68803be073d35beb6af2b860bda4