mysticmode/plan9port
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

sort: rename kcmp to keycmp

Browse Source 
Fixes: #648
Fixes: #655
This commit is contained in:
Dan Cross
2025-07-24 16:35:15 +00:00
parent 67dd74a964
commit 5a9ced10ee
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cmd/sort.c
View File

@@ -108,7 +108,7 @@ void dokey_gn(Key*, uchar*, uchar*, Field*);
void dokey_m(Key*, uchar*, uchar*, Field*); void dokey_m(Key*, uchar*, uchar*, Field*);
void dokey_r(Key*, uchar*, uchar*, Field*); void dokey_r(Key*, uchar*, uchar*, Field*);
void done(char*); void done(char*);
int kcmp(Key*, Key*); int keycmp(Key*, Key*);
void makemapd(Field*); void makemapd(Field*);
void makemapm(Field*); void makemapm(Field*);
void mergefiles(int, int, Biobuf*); void mergefiles(int, int, Biobuf*);
@@ -202,7 +202,7 @@ dofile(Biobuf *b)
l = newline(b); l = newline(b);
if(l == 0) if(l == 0)
break; break;
n = kcmp(ol->key, l->key); n = keycmp(ol->key, l->key);
if(n > 0 || (n == 0 && args.uflag)) { if(n > 0 || (n == 0 && args.uflag)) {
fprint(2, "sort: -c file not in sort\n"); /**/ fprint(2, "sort: -c file not in sort\n"); /**/
done("order"); done("order");
@@ -448,7 +448,7 @@ mergefiles(int t, int n, Biobuf *b)
break; break;
for(;;) { for(;;) {
l = m->line; l = m->line;
if(args.uflag && ok && kcmp(ok, l->key) == 0) { if(args.uflag && ok && keycmp(ok, l->key) == 0) {
free(l->key); free(l->key);
free(l); free(l);
} else { } else {
@@ -467,7 +467,7 @@ mergefiles(int t, int n, Biobuf *b)
} }
m->line = l; m->line = l;
m->key = l->key; m->key = l->key;
if(nn > 1 && kcmp(mmp[0]->key, mmp[1]->key) > 0) if(nn > 1 && keycmp(mmp[0]->key, mmp[1]->key) > 0)
break; break;
} }
} }
@@ -485,7 +485,7 @@ mergefiles(int t, int n, Biobuf *b)
} }
int int
kcmp(Key *ka, Key *kb) keycmp(Key *ka, Key *kb)
{ {
int n, m; int n, m;
@@ -511,7 +511,7 @@ printout(Biobuf *b)
ok = 0; ok = 0;
for(n=args.nline; n>0; n--) { for(n=args.nline; n>0; n--) {
l = *lp++; l = *lp++;
if(args.uflag && ok && kcmp(ok, l->key) == 0) if(args.uflag && ok && keycmp(ok, l->key) == 0)
continue; continue;
lineout(b, l); lineout(b, l);
ok = l->key; ok = l->key;