interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

And changed hresultwrap to only write to the output file in main().

This commit is contained in:
Pietro Gagliardi 2018-05-28 22:50:00 -04:00
parent b590482ccb
commit d4517fab84
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
windows/tools/hresultwrap.cpp
View File

@ -155,7 +155,7 @@ ByteSlice Function::Body(void) const
#define noutbuf 2048 #define noutbuf 2048
Error *generate(ByteSlice line, WriteCloser *fout) ByteSlice generate(ByteSlice line)
{ {
ByteSlice genout; ByteSlice genout;
Function *f; Function *f;
@ -170,19 +170,14 @@ Error *generate(ByteSlice line, WriteCloser *fout)
genout = genout.AppendString(u8"\n"); genout = genout.AppendString(u8"\n");
genout = genout.AppendString(u8"\n"); genout = genout.AppendString(u8"\n");
return fout->Write(genout); return genout;
} }
Error *process(ByteSlice line, WriteCloser *fout) ByteSlice process(ByteSlice line)
{ {
Error *err;
if (line.Len() > 0 && line.Data()[0] == '@') if (line.Len() > 0 && line.Data()[0] == '@')
return generate(line.Slice(1, line.Len()), fout); return generate(line.Slice(1, line.Len()));
err = fout->Write(line); return line.AppendString("\n");
if (err != NULL)
return err;
return fout->Write(ByteSlice().AppendString("\n"));
} }
} }
@ -192,6 +187,7 @@ int main(int argc, char *argv[])
ReadCloser *fin = NULL; ReadCloser *fin = NULL;
WriteCloser *fout = NULL; WriteCloser *fout = NULL;
Scanner *s = NULL; Scanner *s = NULL;
ByteSlice b;
int ret = 1; int ret = 1;
Error *err = NULL; Error *err = NULL;
@ -213,14 +209,17 @@ int main(int argc, char *argv[])
s = new Scanner(fin); s = new Scanner(fin);
while (s->Scan()) { while (s->Scan()) {
err = process(s->Bytes(), fout); b = process(s->Bytes());
err = fout->Write(b);
if (err != NULL) { if (err != NULL) {
fprintf(stderr, "error processing line: %s\n", argv[2], err->String()); fprintf(stderr, "error writing to %s: %s\n", argv[2], err->String());
goto done; goto done;
} }
} }
if (s->Err() != 0) { err = s->Err();
fprintf(stderr, "error reading from %s: %s\n", argv[1], s->Err()->String()); if (err != NULL) {
fprintf(stderr, "error reading from %s: %s\n", argv[1], err->String());
err = NULL; // we don't own err here
goto done; goto done;
} }