Index: ossp-pkg/var/var.c RCS File: /v/ossp/cvs/ossp-pkg/var/var.c,v rcsdiff -q -kk '-r1.33' '-r1.34' -u '/v/ossp/cvs/ossp-pkg/var/var.c,v' 2>/dev/null --- 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]);