From f76e0b330f0be28f9f3af3073904ede3a34d48f5 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 15:34:56 +0200 Subject: Reformat consistently. Strictly whitespace changes only. Indentation by tabs only. Move case labels in switches are on the same level as the switch keyword. Signed-off-by: Ralf Baechle --- rose/rsattach.c | 24 ++++++++++++------------ rose/rsdwnlnk.c | 24 ++++++++++++------------ rose/rsmemsiz.c | 42 +++++++++++++++++++++--------------------- rose/rsuplnk.c | 44 ++++++++++++++++++++++---------------------- 4 files changed, 67 insertions(+), 67 deletions(-) (limited to 'rose') diff --git a/rose/rsattach.c b/rose/rsattach.c index 62892d8..eedf506 100644 --- a/rose/rsattach.c +++ b/rose/rsattach.c @@ -184,19 +184,19 @@ int main(int argc, char *argv[]) while ((fd = getopt(argc, argv, "i:m:v")) != -1) { switch (fd) { - case 'i': - if ((hp = gethostbyname(optarg)) == NULL) { - fprintf(stderr, "rsattach: invalid internet name/address - %s\n", optarg); - return 1; - } - break; - case 'v': - printf("rsattach: %s\n", VERSION); - return 0; - case ':': - case '?': - fprintf(stderr, "usage: rsattach [-i inetaddr] [-v] port\n"); + case 'i': + if ((hp = gethostbyname(optarg)) == NULL) { + fprintf(stderr, "rsattach: invalid internet name/address - %s\n", optarg); return 1; + } + break; + case 'v': + printf("rsattach: %s\n", VERSION); + return 0; + case ':': + case '?': + fprintf(stderr, "usage: rsattach [-i inetaddr] [-v] port\n"); + return 1; } } diff --git a/rose/rsdwnlnk.c b/rose/rsdwnlnk.c index 8c7bb08..dd1cb96 100644 --- a/rose/rsdwnlnk.c +++ b/rose/rsdwnlnk.c @@ -198,18 +198,18 @@ int main(int argc, char **argv) */ if (connect(s, (struct sockaddr *)&axconnect, addrlen) != 0) { switch (errno) { - case ECONNREFUSED: - strcpy(buffer, "*** Connection refused\r"); - break; - case ENETUNREACH: - strcpy(buffer, "*** No known route\r"); - break; - case EINTR: - strcpy(buffer, "*** Connection timed out\r"); - break; - default: - sprintf(buffer, "ERROR: cannot connect to AX.25 callsign, %s\r", strerror(errno)); - break; + case ECONNREFUSED: + strcpy(buffer, "*** Connection refused\r"); + break; + case ENETUNREACH: + strcpy(buffer, "*** No known route\r"); + break; + case EINTR: + strcpy(buffer, "*** Connection timed out\r"); + break; + default: + sprintf(buffer, "ERROR: cannot connect to AX.25 callsign, %s\r", strerror(errno)); + break; } close(s); diff --git a/rose/rsmemsiz.c b/rose/rsmemsiz.c index fc5e805..506395f 100644 --- a/rose/rsmemsiz.c +++ b/rose/rsmemsiz.c @@ -96,30 +96,30 @@ int loadavg(double *av1, double *av5, double *av15) { #define MAX_COL 7 unsigned** meminfo(void) { - static unsigned *row[MAX_ROW + 1]; /* row pointers */ - static unsigned num[MAX_ROW * MAX_COL]; /* number storage */ - char *p; - int i, j, k, l; + static unsigned *row[MAX_ROW + 1]; /* row pointers */ + static unsigned num[MAX_ROW * MAX_COL]; /* number storage */ + char *p; + int i, j, k, l; - FILE_TO_BUF(MEMINFO_FILE) - if (!row[0]) /* init ptrs 1st time through */ + FILE_TO_BUF(MEMINFO_FILE) + if (!row[0]) /* init ptrs 1st time through */ for (i=0; i < MAX_ROW; i++) /* std column major order: */ - row[i] = num + MAX_COL*i; /* A[i][j] = A + COLS*i + j */ - p = buf; - for (i=0; i < MAX_ROW; i++) /* zero unassigned fields */ - for (j=0; j < MAX_COL; j++) - row[i][j] = 0; - for (i=0; i < MAX_ROW && *p; i++) { /* loop over rows */ - while (*p && !isdigit(*p)) p++; /* skip chars until a digit */ - for (j=0; j < MAX_COL && *p; j++) { /* scanf column-by-column */ - l = sscanf(p, "%u%n", row[i] + j, &k); - p += k; /* step over used buffer */ - if (*p == '\n' || l < 1) /* end of line/buffer */ - break; - } - } + row[i] = num + MAX_COL*i; /* A[i][j] = A + COLS*i + j */ + p = buf; + for (i=0; i < MAX_ROW; i++) /* zero unassigned fields */ + for (j=0; j < MAX_COL; j++) + row[i][j] = 0; + for (i=0; i < MAX_ROW && *p; i++) { /* loop over rows */ + while (*p && !isdigit(*p)) p++; /* skip chars until a digit */ + for (j=0; j < MAX_COL && *p; j++) { /* scanf column-by-column */ + l = sscanf(p, "%u%n", row[i] + j, &k); + p += k; /* step over used buffer */ + if (*p == '\n' || l < 1) /* end of line/buffer */ + break; + } + } /* row[i+1] = NULL; terminate the row list, currently unnecessary */ - return row; /* NULL return ==> error */ + return row; /* NULL return ==> error */ } diff --git a/rose/rsuplnk.c b/rose/rsuplnk.c index 5d9be33..fdc88ee 100644 --- a/rose/rsuplnk.c +++ b/rose/rsuplnk.c @@ -107,16 +107,16 @@ int main(int argc, char **argv) if ((p = strchr(addr, '-')) != NULL) *p = '\0'; switch (strlen(addr)) { - case 4: - memcpy(rose_address + 0, addr, 4); - dnicindex = n; - break; - case 6: - memcpy(rose_address + 4, addr, 6); - addrindex = n; - break; - default: - break; + case 4: + memcpy(rose_address + 0, addr, 4); + dnicindex = n; + break; + case 6: + memcpy(rose_address + 4, addr, 6); + addrindex = n; + break; + default: + break; } } } @@ -208,18 +208,18 @@ int main(int argc, char **argv) */ if (connect(s, (struct sockaddr *)&roseconnect, addrlen) != 0) { switch (errno) { - case ECONNREFUSED: - strcpy(buffer, "*** Disconnected - 0100 - Number Busy\r"); - break; - case ENETUNREACH: - strcpy(buffer, "*** Disconnected - 0D00 - Not Obtainable\r"); - break; - case EINTR: - strcpy(buffer, "*** Disconnected - 3900 - Ship Absent\r"); - break; - default: - sprintf(buffer, "*** Disconnected - %d - %s\r", errno, strerror(errno)); - break; + case ECONNREFUSED: + strcpy(buffer, "*** Disconnected - 0100 - Number Busy\r"); + break; + case ENETUNREACH: + strcpy(buffer, "*** Disconnected - 0D00 - Not Obtainable\r"); + break; + case EINTR: + strcpy(buffer, "*** Disconnected - 3900 - Ship Absent\r"); + break; + default: + sprintf(buffer, "*** Disconnected - %d - %s\r", errno, strerror(errno)); + break; } close(s); -- cgit v1.2.3