Skip to content

Commit eeca10e

Browse files
authored
Merge pull request #155 from Konamiman/support_longs_in_fdisk
Activate support for long integers in the printf routine
2 parents b7e265f + d41ac77 commit eeca10e

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

source/kernel/bank5/fdisk.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,8 +1229,7 @@ void TestDeviceAccess()
12291229
InitializeScreenForTestDeviceAccess(message);
12301230

12311231
while(GetKey() == 0) {
1232-
sprintf(buffer, "%u", sectorNumber);
1233-
//_ultoa(sectorNumber, buffer, 10);
1232+
sprintf(buffer, "%lu", sectorNumber);
12341233
Locate(messageLen, MESSAGE_ROW);
12351234
print(buffer);
12361235
print(" ...\x1BK");
@@ -1245,7 +1244,7 @@ void TestDeviceAccess()
12451244

12461245
if((error = regs.Bytes.A) != 0) {
12471246
strcpy(buffer, errorMessageHeader);
1248-
sprintf(buffer + strlen(errorMessageHeader), "%u", sectorNumber);
1247+
sprintf(buffer + strlen(errorMessageHeader), "%lu", sectorNumber);
12491248
strcpy(buffer + strlen(buffer), ":");
12501249
PrintDosErrorMessage(error, buffer);
12511250
PrintStateMessage("Continue reading sectors? (y/n) ");

source/tools/C/printf.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
%lx: hexadecimal long
2525
*/
2626

27-
//#define SUPPORT_LONG
27+
#define SUPPORT_LONG
2828

2929
#include <stdarg.h>
3030
#include "system.h"
@@ -160,12 +160,7 @@ static int format_string(const char* buf, const char *fmt, va_list ap)
160160
else if(theChar == 'x') {
161161
base = 16;
162162
}
163-
#ifdef SUPPORT_LONG
164-
else if(isLong) {
165-
fmtPnt--;
166-
} else
167-
#endif
168-
if(theChar != 'd' && theChar != 'i') {
163+
else if(theChar != 'd' && theChar != 'i') {
169164
do_char_inc(theChar);
170165
continue;
171166
}

0 commit comments

Comments
 (0)