From f8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7 Mon Sep 17 00:00:00 2001 From: zlg Date: Thu, 16 Jun 2016 10:15:33 -0700 Subject: The massive astyle sweep! Code style should be consistent now. All future commits will be run through astyle or they will be amended. --- ch5/5-15_sort-fold.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'ch5/5-15_sort-fold.c') diff --git a/ch5/5-15_sort-fold.c b/ch5/5-15_sort-fold.c index 90b567b..90c658f 100644 --- a/ch5/5-15_sort-fold.c +++ b/ch5/5-15_sort-fold.c @@ -31,7 +31,6 @@ int istrcmp(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; } @@ -49,7 +48,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) { @@ -63,7 +61,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; @@ -77,7 +74,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; } @@ -104,7 +101,7 @@ void reverse_set(char *lineptr[], int nlines) { /* Ignore character case, then send results to qsort */ int istrcmp(const char *s1, const char *s2) { - for ( ; tolower(*s1) == tolower(*s2); s1++, s2++) { + for (; tolower(*s1) == tolower(*s2); s1++, s2++) { if (*s1 == '\0') { return 0; } @@ -135,18 +132,17 @@ 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 */ int fold = 0; /* 1 if folding upper and lower case */ - 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; -- cgit v1.2.3-70-g09d2 tash/log/LICENSE?h=next&id=deb34f6cb8902277ac4cf4feca1b44c1ba085f98&follow=1'>LICENSE (unfollow)
AgeCommit message (Expand)AuthorFilesLines
2018-10-18cli: show msg if game to be deleted is not in DBzlg2-2/+12
2018-10-18README: expand on usage, cover shell quotingzlg1-7/+99
2018-10-18cli: Tell the user when a game lacks noteszlg2-3/+15
2018-10-18Catch when an invalid list filter is passedzlg4-3/+24
2018-10-12cli: Add zero-game import/export messageszlg2-11/+18
2018-10-10Bump to 0.3beta1 for PyPIzlg1-1/+1
2018-10-10Move tests and data to dedicated directoryzlg7-10/+26
2018-10-10cli: Add "export" commandzlg2-5/+54
2018-10-10cli: Add "import" commandzlg5-1/+76
2018-10-09Bump to 0.3alpha6 for PyPIzlg1-1/+1
2018-10-09cli: Add "notes" commandzlg2-4/+74
2018-10-09update_game: ensure notes are also savedzlg1-2/+2
2018-10-09cli: add 'update' commandzlg3-20/+92
2018-10-06cli: Add "delete" commandzlg2-0/+19
2018-10-06Remove ID field from DBzlg3-38/+46
2018-10-06cli: change "Status" heading to "Progress"zlg2-36/+40
2018-09-29Bump to 0.3alpha5 for PyPIzlg1-1/+1
2018-09-29cli: Add pretty printing to 'list' commandzlg3-17/+107
2018-09-08setup.py: Bump to alpha4 for PyPIzlg1-1/+1
2018-09-08cli: add '--raw' option to list commandzlg2-9/+45
2018-09-08Add remaining filters to vgstash packagezlg1-2/+11
2018-09-04Update LICENSE to match setup.pyzlg1-80/+67
2018-09-03Branch off from master with pytest, tox, clickzlg16-778/+779
2018-03-18Flesh out filter types and ownership statuszlg3-82/+144
2018-03-18README.mdown: break line correctlyzlg1-1/+1
2018-03-18add 'playlog' list filterzlg2-2/+9
2018-03-13Update helpers a bitzlg1-2/+9
2018-03-13Make VGSTASH_DB_LOCATION point to a filezlg2-21/+20
2016-11-18Remove settings from helpers.shZe Libertine Gamer1-5/+0
2016-11-15Correct phrasing in README.Ze Libertine Gamer1-4/+4
2016-11-13DerpZe Libertine Gamer1-0/+1
2016-11-03Improve error handling in shell scriptsZe Libertine Gamer4-3/+23
2016-10-24Correct run_again, add recursionZe Libertine Gamer1-0/+4
2016-10-21Add quotes to correct behavior for arglistZe Libertine Gamer1-1/+1
2016-10-14updater.sh: add recursion, error handlingZe Libertine Gamer1-43/+101
2016-10-14Correct pipe-handling behaviorZe Libertine Gamer1-1/+9
2016-10-12Clarify a method to move between platformsZe Libertine Gamer1-2/+5