From a9e185ae4d0e791c7d2af4ce6fa4f67a3d7bb9a7 Mon Sep 17 00:00:00 2001 From: Joseph Poirier Date: Tue, 15 Aug 2017 00:33:14 -0500 Subject: [PATCH] printf tweaks --- cstdlib/stdio.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cstdlib/stdio.c b/cstdlib/stdio.c index 5be68cc..1004f8f 100644 --- a/cstdlib/stdio.c +++ b/cstdlib/stdio.c @@ -96,8 +96,7 @@ void StdioOutPuts(const char *Str, StdOutStream *Stream) } /* printf-style format of an int or other word-sized object */ -void StdioFprintfWord(StdOutStream *Stream, const char *Format, - unsigned long Value) +void StdioFprintfWord(StdOutStream *Stream, const char *Format, unsigned int Value) { if (Stream->FilePtr != NULL) Stream->CharCount += fprintf(Stream->FilePtr, Format, Value); @@ -310,9 +309,10 @@ int StdioBasePrintf(struct ParseState *Parser, FILE *Stream, char *StrOut, } /* copy one character of format across to the OneFormatBuf */ - OneFormatBuf[OneFormatCount] = *FPos; - OneFormatCount++; - + if (*FPos != 'l') { + OneFormatBuf[OneFormatCount] = *FPos; + OneFormatCount++; + } /* do special actions depending on the conversion type */ if (ShowType == &pc->VoidType) { switch (*FPos) { @@ -328,7 +328,7 @@ int StdioBasePrintf(struct ParseState *Parser, FILE *Stream, char *StrOut, break; case 'n': ThisArg = (struct Value*)((char*)ThisArg + - MEM_ALIGN(sizeof(struct Value)+TypeStackSizeValue(ThisArg))); + MEM_ALIGN(sizeof(struct Value) + TypeStackSizeValue(ThisArg))); if (ThisArg->Typ->Base == TypeArray && ThisArg->Typ->FromType->Base == TypeInt) *(int *)ThisArg->Val->Pointer = SOStream.CharCount; @@ -419,7 +419,7 @@ int StdioBaseScanf(struct ParseState *Parser, FILE *Stream, char *StrIn, for (ArgCount = 0; ArgCount < Args->NumArgs; ArgCount++) { ThisArg = (struct Value*)((char*)ThisArg + - MEM_ALIGN(sizeof(struct Value)+TypeStackSizeValue(ThisArg))); + MEM_ALIGN(sizeof(struct Value) + TypeStackSizeValue(ThisArg))); if (ThisArg->Typ->Base == TypePointer) ScanfArg[ArgCount] = ThisArg->Val->Pointer;