diff options
| author | Jason Parker <jparker@digium.com> | 2008-08-25 16:12:39 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2008-08-25 16:12:39 +0000 |
| commit | d0e99e778fed9b433dd734a72b61488eb77aae5e (patch) | |
| tree | 1aec86a774855b59ef8cbcfd70049f7d4455e5ee /dahdi_cfg.c | |
| parent | f2734f6a7ce78609d43a3b7f3e3fba96809f0919 (diff) | |
Fix more crazy formatting
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4827 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'dahdi_cfg.c')
| -rw-r--r-- | dahdi_cfg.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/dahdi_cfg.c b/dahdi_cfg.c index 559c6cc..56a7396 100644 --- a/dahdi_cfg.c +++ b/dahdi_cfg.c @@ -492,7 +492,7 @@ static int chanconfig(char *keyword, char *args) res = apply_channels(chans, args); if (res <= 0) return -1; - for (x=1;x<DAHDI_MAX_CHANNELS;x++) + for (x=1;x<DAHDI_MAX_CHANNELS;x++) { if (chans[x]) { if (slineno[x]) { error("Channel %d already configured as '%s' at line %d\n", x, sig[x], slineno[x]); @@ -617,6 +617,7 @@ static int chanconfig(char *keyword, char *args) fprintf(stderr, "Huh? (%s)\n", keyword); } } + } return 0; } @@ -1148,7 +1149,10 @@ static int rad_chanconfig(char *keyword, char *args) if (chans[x]) { p.radpar = DAHDI_RADPAR_NUMTONES; if (ind_ioctl(x,fd,DAHDI_RADIO_GETPARAM,&p) == -1) - n = 0; else n = p.data; + n = 0; + else + n = p.data; + if (n) { p.radpar = DAHDI_RADPAR_INITTONE; @@ -1290,12 +1294,16 @@ static void printconfig(int fd) if (ae[x].echocan[0]) { printf(" (Echo Canceler: %s)", ae[x].echocan); } - for (y=1;y<DAHDI_MAX_CHANNELS;y++) + for (y=1;y<DAHDI_MAX_CHANNELS;y++) { if (cc[y].master == x) { printf("%s%02d", ps++ ? " " : " (Slaves: ", y); } + } } - if (ps) printf(")\n"); else printf("\n"); + if (ps) + printf(")\n"); + else + printf("\n"); } else if (cc[x].sigtype) configs++; } @@ -1613,9 +1621,10 @@ finish: printf("Loading tone zone for %s\n", zonestoload[x]); fflush(stdout); } - if (tone_zone_register(fd, zonestoload[x])) + if (tone_zone_register(fd, zonestoload[x])) { if (errno != EBUSY) error("Unable to register tone zone '%s'\n", zonestoload[x]); + } } if (debug & DEBUG_APPLY) { printf("Doing startup\n"); |