From 02cb8b33e61f2a459da2ddb798c82092d3837241 Mon Sep 17 00:00:00 2001 From: cdez Date: Wed, 28 Feb 2024 10:23:25 -0700 Subject: [PATCH] Fixed the getNumberArg issue, which is what was causing so much headache. Multiplier variable not set correctly. +- metadataops.c +- sim02 --- Sim02/metadataops.c | 6 +++--- Sim02/sim02 | Bin 62072 -> 62064 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sim02/metadataops.c b/Sim02/metadataops.c index 9eafcc9..f2b2256 100644 --- a/Sim02/metadataops.c +++ b/Sim02/metadataops.c @@ -545,16 +545,16 @@ int getNumberArg(int *number, const char *inputStr, int index) index = index + 1; } // loop across string length - while(isDigit(inputStr[index]) == true && + while(isDigit(inputStr[index]) && inputStr[index] != NULL_CHAR) { // set digit found flag foundDigit = true; // assign digit to output - (*number) = (*number) * multiplier + inputStr[index] - '0'; + (*number) = (*number) * multiplier + (inputStr[index] - '0'); // increment index and multiplier index = index + 1; - multiplier = multiplier + 1; + multiplier = 10; } // check for digit not found if(!foundDigit) diff --git a/Sim02/sim02 b/Sim02/sim02 index a5dd9388551c457e09bf617455ec959f0d3b61cb..89c95d0000293b4d3fe3b29c435eb8e4b013dcbf 100755 GIT binary patch delta 5094 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 J#QN)o{{n#tdu0Fs