3. inline copyNextLine --- build/parseSpec.c.pix 2007-12-20 21:35:43.000000000 +0100 +++ build/parseSpec.c 2007-12-20 21:40:24.000000000 +0100 @@ -214,20 +214,6 @@ *last = '\0'; } -/** - */ -static int copyNextLine(rpmSpec spec, OFI_t *ofi, int strip) -{ - restoreFirstChar(spec); - - int rc = copyNextLineFromOFI(spec, ofi); - if (rc != 0) return rc; - - copyNextLineFinish(spec, strip); - - return 0; -} - static int readLineFromOFI(rpmSpec spec, OFI_t *ofi) { retry: @@ -296,12 +282,16 @@ return rc; /* Copy next file line into the spec line buffer */ - if ((rc = copyNextLine(spec, ofi, strip)) != 0) { + restoreFirstChar(spec); + + if ((rc = copyNextLineFromOFI(spec, ofi)) != 0) { if (rc == RPMRC_FAIL) goto retry; return rc; } + copyNextLineFinish(spec, strip); + s = spec->line; SKIPSPACE(s);