|
Check-in Number:
|
1381 | |
| Date: |
2001-Nov-20 15:04:06 (local)
2001-Nov-20 14:04:06 (UTC) |
| User: | thl |
| Branch: | |
| Comment: |
THLs review |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/var/var.c 1.33 -> 1.34
--- var.c 2001/11/20 13:44:01 1.33
+++ var.c 2001/11/20 14:04:06 1.34
@@ -1469,44 +1469,41 @@
if (*p != '/')
return VAR_ERR_MALFORMATTED_PADDING;
- else
- ++p;
+ ++p;
rc = number(p, end);
if (rc == 0) {
rc = VAR_ERR_MISSING_PADDING_WIDTH;
goto error_return;
- } else {
- number1.begin = p;
- number1.end = p + rc;
- number1.buffer_size = 0;
- p += rc;
}
+ number1.begin = p;
+ number1.end = p + rc;
+ number1.buffer_size = 0;
+ p += rc;
if (*p != '/') {
rc = VAR_ERR_MALFORMATTED_PADDING;
goto error_return;
- } else
- ++p;
+ }
+ ++p;
rc = substext_or_variable(p, end, config, nameclass, lookup,
lookup_context, force_expand, &replace);
if (rc < 0)
goto error_return;
- else
- p += rc;
+ p += rc;
if (*p != '/') {
rc = VAR_ERR_MALFORMATTED_PADDING;
goto error_return;
- } else
- ++p;
+ }
+ ++p;
if (*p != 'l' && *p != 'c' && *p != 'r') {
rc = VAR_ERR_MALFORMATTED_PADDING;
goto error_return;
- } else
- ++p;
+ }
+ ++p;
if (data->begin) {
rc = padding(data, &number1, &replace, p[-1]);
|
|
