diff options
author | Russell Bryant <russell@digium.com> | 2008-08-03 16:38:30 +0000 |
---|---|---|
committer | Russell Bryant <russell@digium.com> | 2008-08-03 16:38:30 +0000 |
commit | 53bb164eda38b8591a88146fbf81652041eeb9b1 (patch) | |
tree | 7af0bd5ef4bda3d50828a131c334560bd8ab4931 | |
parent | 3e769ba4640df1f3fe480498c31351efe58b5ec3 (diff) |
reduce indentation and tweak formatting of a for loop in proc_read
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4684 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/dahdi-base.c | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 37a128e..5d5e195 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -604,44 +604,41 @@ static int dahdi_proc_read(char *page, char **start, off_t off, int count, int * len += sprintf(page + len, "\tTiming slips: %d\n", spans[span]->timingslips); len += sprintf(page + len, "\n"); + for (x = 1; x < DAHDI_MAX_CHANNELS; x++) { + if (!chans[x]) + continue; - for (x=1;x<DAHDI_MAX_CHANNELS;x++) { - if (chans[x]) { - if (chans[x]->span && (chans[x]->span->spanno == span)) { - if (chans[x]->name) - len += sprintf(page + len, "\t%4d %s ", x, chans[x]->name); - if (chans[x]->sig) { - if (chans[x]->sig == DAHDI_SIG_SLAVE) - len += sprintf(page + len, "%s ", sigstr(chans[x]->master->sig)); - else { - len += sprintf(page + len, "%s ", sigstr(chans[x]->sig)); - if (chans[x]->nextslave && chans[x]->master->channo == x) - len += sprintf(page + len, "Master "); - } - } - if (test_bit(DAHDI_FLAGBIT_OPEN, &chans[x]->flags)) { - len += sprintf(page + len, "(In use) "); + if (chans[x]->span && (chans[x]->span->spanno == span)) { + if (chans[x]->name) + len += sprintf(page + len, "\t%4d %s ", x, chans[x]->name); + if (chans[x]->sig) { + if (chans[x]->sig == DAHDI_SIG_SLAVE) + len += sprintf(page + len, "%s ", sigstr(chans[x]->master->sig)); + else { + len += sprintf(page + len, "%s ", sigstr(chans[x]->sig)); + if (chans[x]->nextslave && chans[x]->master->channo == x) + len += sprintf(page + len, "Master "); } + } + if (test_bit(DAHDI_FLAGBIT_OPEN, &chans[x]->flags)) + len += sprintf(page + len, "(In use) "); #ifdef OPTIMIZE_CHANMUTE - if (chans[x]->chanmute) { - len += sprintf(page + len, "(no pcm) "); - } + if (chans[x]->chanmute) + len += sprintf(page + len, "(no pcm) "); #endif - len += fill_alarm_string(page + len, count - len, chans[x]->chan_alarms); + len += fill_alarm_string(page + len, count - len, chans[x]->chan_alarms); - if (chans[x]->ec_factory) { - len += sprintf(page + len, " (EC: %s) ", chans[x]->ec_factory->name); - } + if (chans[x]->ec_factory) + len += sprintf(page + len, " (EC: %s) ", chans[x]->ec_factory->name); - len += sprintf(page + len, "\n"); - } - if (len <= off) { /* If everything printed so far is before beginning of request */ - off -= len; - len = 0; - } - if (len > off+count) /* stop if we've already generated enough */ - break; + len += sprintf(page + len, "\n"); + } + if (len <= off) { /* If everything printed so far is before beginning of request */ + off -= len; + len = 0; } + if (len > off + count) /* stop if we've already generated enough */ + break; } if (len <= off) { /* If everything printed so far is before beginning of request */ off -= len; @@ -649,7 +646,8 @@ static int dahdi_proc_read(char *page, char **start, off_t off, int count, int * } *start = page + off; len -= off; /* un-count any remaining offset */ - if (len > count) len = count; /* don't return bytes not asked for */ + if (len > count) + len = count; /* don't return bytes not asked for */ return len; } #endif |