aboutsummaryrefslogtreecommitdiff
path: root/ch5/5-14_rsort.c
diff options
context:
space:
mode:
authorzlg <zlg@zlg.space>2016-06-16 10:15:33 -0700
committerzlg <zlg@zlg.space>2016-06-16 10:15:33 -0700
commitf8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7 (patch)
treee37b327d7f93435e93a57427600d2b91fbb0cd87 /ch5/5-14_rsort.c
parentSolve Exercise 7-2: Format arbitrary input (diff)
downloadknr-f8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7.tar.gz
knr-f8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7.tar.bz2
knr-f8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7.tar.xz
knr-f8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7.zip
The massive astyle sweep!
Code style should be consistent now. All future commits will be run through astyle or they will be amended.
Diffstat (limited to 'ch5/5-14_rsort.c')
-rw-r--r--ch5/5-14_rsort.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/ch5/5-14_rsort.c b/ch5/5-14_rsort.c
index b39a20c..5b19e6d 100644
--- a/ch5/5-14_rsort.c
+++ b/ch5/5-14_rsort.c
@@ -29,7 +29,6 @@ int numcmp(const char *, const char *);
void my_qsort(void *v[], int left, int right, int (*comp)(const char *, const char *)) {
int i, last;
void swap(void *v[], int, int);
-
if (left >= right) {
return;
}
@@ -47,7 +46,6 @@ void my_qsort(void *v[], int left, int right, int (*comp)(const char *, const ch
int numcmp(const char *s1, const char *s2) {
double v1, v2;
-
v1 = atof(s1);
v2 = atof(s2);
if (v1 < v2) {
@@ -61,7 +59,6 @@ int numcmp(const char *s1, const char *s2) {
void swap(void *v[], int i, int j) {
void *temp;
-
temp = v[i];
v[i] = v[j];
v[j] = temp;
@@ -75,7 +72,7 @@ int readlines(char *lineptr[], int maxlines) {
if (nlines >= maxlines || (p = alloc(len)) == NULL) {
return -1;
} else {
- line[len-1] = '\0';
+ line[len - 1] = '\0';
strcpy(p, line);
lineptr[nlines++] = p;
}
@@ -123,17 +120,16 @@ char *alloc(int n) {
}
/* sort input lines */
-int main (int argc, char *argv[]) {
+int main(int argc, char *argv[]) {
int nlines; /* number of input lines read */
int numeric = 0; /* 1 if numeric sort */
int reverse = 0; /* 1 if reverse sort */
-
if (argc > 1) {
int i, j;
for (i = 1, j = 0; --argc; i++) {
if (argv[i][j++] == '-') {
while (argv[i][j] != '\0') {
- switch(argv[i][j]) {
+ switch (argv[i][j]) {
case 'n':
numeric = 1;
break;