summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-10-22 17:42:26 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-10-22 17:42:26 (GMT)
commit6935ec9c0b2ac58b1ddc206c21bea36582e1f233 (patch)
tree50ffa8f359c7eb8830f5e0b512954e87071978ac
parentf125b6d341b06fda5412b82d23e486100e107eaa (diff)
downloadbusybox-6935ec9c0b2ac58b1ddc206c21bea36582e1f233.tar.gz
busybox-6935ec9c0b2ac58b1ddc206c21bea36582e1f233.tar.bz2
networking/interface.c: tiny code shrink
function old new delta if_readlist_proc 634 631 -3 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--editors/sed.c6
-rw-r--r--networking/interface.c18
2 files changed, 12 insertions, 12 deletions
diff --git a/editors/sed.c b/editors/sed.c
index e7b2c21..9b360b6 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -359,7 +359,8 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
continue;
}
/* Skip spaces */
- if (isspace(substr[idx])) continue;
+ if (isspace(substr[idx]))
+ continue;
switch (substr[idx]) {
/* Replace all occurrences */
@@ -417,8 +418,7 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
/* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */
else if (strchr("aic", sed_cmd->cmd)) {
if ((sed_cmd->end_line || sed_cmd->end_match) && sed_cmd->cmd != 'c')
- bb_error_msg_and_die
- ("only a beginning address can be specified for edit commands");
+ bb_error_msg_and_die("only a beginning address can be specified for edit commands");
for (;;) {
if (*cmdstr == '\n' || *cmdstr == '\\') {
cmdstr++;
diff --git a/networking/interface.c b/networking/interface.c
index ef187be..fe6b23d 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -410,20 +410,20 @@ static struct interface *add_interface(char *name)
static char *get_name(char *name, char *p)
{
/* Extract <name> from nul-terminated p where p matches
- <name>: after leading whitespace.
- If match is not made, set name empty and return unchanged p */
- int namestart = 0, nameend = 0;
+ * <name>: after leading whitespace.
+ * If match is not made, set name empty and return unchanged p
+ */
+ char *nameend;
+ char *namestart = skip_whitespace(p);
- while (isspace(p[namestart]))
- namestart++;
nameend = namestart;
- while (p[nameend] && p[nameend] != ':' && !isspace(p[nameend]))
+ while (*nameend && *nameend != ':' && !isspace(*nameend))
nameend++;
- if (p[nameend] == ':') {
+ if (*nameend == ':') {
if ((nameend - namestart) < IFNAMSIZ) {
- memcpy(name, &p[namestart], nameend - namestart);
+ memcpy(name, namestart, nameend - namestart);
name[nameend - namestart] = '\0';
- p = &p[nameend];
+ p = nameend;
} else {
/* Interface name too large */
name[0] = '\0';