fixed spacing

This commit is contained in:
Дмитрий Левин 2005-10-06 18:21:40 +00:00
parent 0b1e0e9ee4
commit 35877f4306
7 changed files with 14 additions and 14 deletions

View File

@ -37,14 +37,14 @@ int parseBuildInstallClean(Spec spec, rpmParseState parsePart)
*sbp = newStringBuf(); *sbp = newStringBuf();
/* There are no options to %build, %install, or %clean */ /* There are no options to %build, %install, or %clean */
if ((rc = readLine(spec, STRIP_NOTHING)) == 1) if ((rc = readLine(spec, STRIP_NOTHING)) == 1)
return PART_NONE; return PART_NONE;
if (rc) if (rc)
return rc; return rc;
while (! (nextPart = isPart(spec->line))) { while (! (nextPart = isPart(spec->line))) {
appendStringBuf(*sbp, spec->line); appendStringBuf(*sbp, spec->line);
if ((rc = readLine(spec, STRIP_NOTHING)) == 1) if ((rc = readLine(spec, STRIP_NOTHING)) == 1)
return PART_NONE; return PART_NONE;
if (rc) if (rc)
return rc; return rc;

View File

@ -208,7 +208,7 @@ int parseChangelog(Spec spec)
StringBuf sb = newStringBuf(); StringBuf sb = newStringBuf();
/* There are no options to %changelog */ /* There are no options to %changelog */
if ((rc = readLine(spec, STRIP_COMMENTS)) == 1) { if ((rc = readLine(spec, STRIP_COMMENTS)) == 1) {
sb = freeStringBuf(sb); sb = freeStringBuf(sb);
return PART_NONE; return PART_NONE;
} }
@ -217,7 +217,7 @@ int parseChangelog(Spec spec)
while (! (nextPart = isPart(spec->line))) { while (! (nextPart = isPart(spec->line))) {
appendStringBuf(sb, spec->line); appendStringBuf(sb, spec->line);
if ((rc = readLine(spec, STRIP_COMMENTS)) == 1) { if ((rc = readLine(spec, STRIP_COMMENTS)) == 1) {
nextPart = PART_NONE; nextPart = PART_NONE;
break; break;
} }

View File

@ -106,7 +106,7 @@ int parseDescription(Spec spec)
sb = newStringBuf(); sb = newStringBuf();
if ((rc = readLine(spec, STRIP_TRAILINGSPACE | STRIP_COMMENTS)) == 1) { if ((rc = readLine(spec, STRIP_TRAILINGSPACE | STRIP_COMMENTS)) == 1) {
nextPart = PART_NONE; nextPart = PART_NONE;
} else { } else {
if (rc) { if (rc) {
@ -116,7 +116,7 @@ int parseDescription(Spec spec)
appendLineStringBuf(sb, spec->line); appendLineStringBuf(sb, spec->line);
if (t) t->t_nlines++; if (t) t->t_nlines++;
if ((rc = if ((rc =
readLine(spec, STRIP_TRAILINGSPACE | STRIP_COMMENTS)) == 1) { readLine(spec, STRIP_TRAILINGSPACE | STRIP_COMMENTS)) == 1) {
nextPart = PART_NONE; nextPart = PART_NONE;
break; break;
} }

View File

@ -96,14 +96,14 @@ int parseFiles(Spec spec)
pkg->fileList = newStringBuf(); pkg->fileList = newStringBuf();
if ((rc = readLine(spec, STRIP_COMMENTS)) == 1) { if ((rc = readLine(spec, STRIP_COMMENTS)) == 1) {
nextPart = PART_NONE; nextPart = PART_NONE;
} else { } else {
if (rc) if (rc)
goto exit; goto exit;
while (! (nextPart = isPart(spec->line))) { while (! (nextPart = isPart(spec->line))) {
appendStringBuf(pkg->fileList, spec->line); appendStringBuf(pkg->fileList, spec->line);
if ((rc = readLine(spec, STRIP_COMMENTS)) == 1) { if ((rc = readLine(spec, STRIP_COMMENTS)) == 1) {
nextPart = PART_NONE; nextPart = PART_NONE;
break; break;
} }

View File

@ -872,7 +872,7 @@ int parsePreamble(Spec spec, int initialPackage)
xx = headerAddEntry(pkg->header, RPMTAG_NAME, RPM_STRING_TYPE, NVR, 1); xx = headerAddEntry(pkg->header, RPMTAG_NAME, RPM_STRING_TYPE, NVR, 1);
} }
if ((rc = readLine(spec, STRIP_TRAILINGSPACE | STRIP_COMMENTS)) == 1) { if ((rc = readLine(spec, STRIP_TRAILINGSPACE | STRIP_COMMENTS)) == 1) {
nextPart = PART_NONE; nextPart = PART_NONE;
} else { } else {
if (rc) if (rc)
@ -894,7 +894,7 @@ int parsePreamble(Spec spec, int initialPackage)
return PART_BUILDARCHITECTURES; return PART_BUILDARCHITECTURES;
} }
if ((rc = if ((rc =
readLine(spec, STRIP_TRAILINGSPACE | STRIP_COMMENTS)) == 1) { readLine(spec, STRIP_TRAILINGSPACE | STRIP_COMMENTS)) == 1) {
nextPart = PART_NONE; nextPart = PART_NONE;
break; break;
} }

View File

@ -565,7 +565,7 @@ int parsePrep(Spec spec)
spec->prep = newStringBuf(); spec->prep = newStringBuf();
/* There are no options to %prep */ /* There are no options to %prep */
if ((rc = readLine(spec, STRIP_NOTHING)) == 1) { if ((rc = readLine(spec, STRIP_NOTHING)) == 1) {
return PART_NONE; return PART_NONE;
} }
if (rc) if (rc)
@ -577,7 +577,7 @@ int parsePrep(Spec spec)
/* Need to expand the macros inline. That way we */ /* Need to expand the macros inline. That way we */
/* can give good line number information on error. */ /* can give good line number information on error. */
appendStringBuf(sb, spec->line); appendStringBuf(sb, spec->line);
if ((rc = readLine(spec, STRIP_NOTHING)) == 1) { if ((rc = readLine(spec, STRIP_NOTHING)) == 1) {
nextPart = PART_NONE; nextPart = PART_NONE;
break; break;
} }

View File

@ -242,14 +242,14 @@ int parseScript(Spec spec, int parsePart)
} }
sb = newStringBuf(); sb = newStringBuf();
if ((rc = readLine(spec, STRIP_NOTHING)) == 1) { if ((rc = readLine(spec, STRIP_NOTHING)) == 1) {
nextPart = PART_NONE; nextPart = PART_NONE;
} else { } else {
if (rc) if (rc)
goto exit; goto exit;
while (! (nextPart = isPart(spec->line))) { while (! (nextPart = isPart(spec->line))) {
appendStringBuf(sb, spec->line); appendStringBuf(sb, spec->line);
if ((rc = readLine(spec, STRIP_NOTHING)) == 1) { if ((rc = readLine(spec, STRIP_NOTHING)) == 1) {
nextPart = PART_NONE; nextPart = PART_NONE;
break; break;
} }