gered/picoc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

printf tweaks

Browse source
This commit is contained in:
Joseph Poirier 2017-08-15 00:33:14 -05:00
parent 3b800edbde
commit a9e185ae4d
No known key found for this signature in database
GPG key ID: 65858A2540EBDA40
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cstdlib/stdio.c
View file

@ -96,8 +96,7 @@ void StdioOutPuts(const char *Str, StdOutStream *Stream)
} }
/* printf-style format of an int or other word-sized object */ /* printf-style format of an int or other word-sized object */
void StdioFprintfWord(StdOutStream *Stream, const char *Format, void StdioFprintfWord(StdOutStream *Stream, const char *Format, unsigned int Value)
unsigned long Value)
{ {
if (Stream->FilePtr != NULL) if (Stream->FilePtr != NULL)
Stream->CharCount += fprintf(Stream->FilePtr, Format, Value); 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 */ /* copy one character of format across to the OneFormatBuf */
OneFormatBuf[OneFormatCount] = *FPos; if (*FPos != 'l') {
OneFormatCount++; OneFormatBuf[OneFormatCount] = *FPos;
OneFormatCount++;
}
/* do special actions depending on the conversion type */ /* do special actions depending on the conversion type */
if (ShowType == &pc->VoidType) { if (ShowType == &pc->VoidType) {
switch (*FPos) { switch (*FPos) {
@ -328,7 +328,7 @@ int StdioBasePrintf(struct ParseState *Parser, FILE *Stream, char *StrOut,
break; break;
case 'n': case 'n':
ThisArg = (struct Value*)((char*)ThisArg + ThisArg = (struct Value*)((char*)ThisArg +
MEM_ALIGN(sizeof(struct Value)+TypeStackSizeValue(ThisArg))); MEM_ALIGN(sizeof(struct Value) + TypeStackSizeValue(ThisArg)));
if (ThisArg->Typ->Base == TypeArray && if (ThisArg->Typ->Base == TypeArray &&
ThisArg->Typ->FromType->Base == TypeInt) ThisArg->Typ->FromType->Base == TypeInt)
*(int *)ThisArg->Val->Pointer = SOStream.CharCount; *(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++) { for (ArgCount = 0; ArgCount < Args->NumArgs; ArgCount++) {
ThisArg = (struct Value*)((char*)ThisArg + ThisArg = (struct Value*)((char*)ThisArg +
MEM_ALIGN(sizeof(struct Value)+TypeStackSizeValue(ThisArg))); MEM_ALIGN(sizeof(struct Value) + TypeStackSizeValue(ThisArg)));
if (ThisArg->Typ->Base == TypePointer) if (ThisArg->Typ->Base == TypePointer)
ScanfArg[ArgCount] = ThisArg->Val->Pointer; ScanfArg[ArgCount] = ThisArg->Val->Pointer;