Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmd/sort: Rename kcmp to Kcmp to fix FreeBSD compile error #655

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cmd/sort: Rename kcmp to Kcmp to fix FreeBSD compile error #655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/cmd/sort.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void dokey_gn(Key*, uchar*, uchar*, Field*);
void dokey_m(Key*, uchar*, uchar*, Field*);
void dokey_r(Key*, uchar*, uchar*, Field*);
void done(char*);
int kcmp(Key*, Key*);
int Kcmp(Key*, Key*);
void makemapd(Field*);
void makemapm(Field*);
void mergefiles(int, int, Biobuf*);
Expand Down Expand Up @@ -202,7 +202,7 @@ dofile(Biobuf *b)
l = newline(b);
if(l == 0)
break;
n = kcmp(ol->key, l->key);
n = Kcmp(ol->key, l->key);
if(n > 0 || (n == 0 && args.uflag)) {
fprint(2, "sort: -c file not in sort\n"); /**/
done("order");
Expand Down Expand Up @@ -448,7 +448,7 @@ mergefiles(int t, int n, Biobuf *b)
break;
for(;;) {
l = m->line;
if(args.uflag && ok && kcmp(ok, l->key) == 0) {
if(args.uflag && ok && Kcmp(ok, l->key) == 0) {
free(l->key);
free(l);
} else {
Expand All @@ -467,7 +467,7 @@ mergefiles(int t, int n, Biobuf *b)
}
m->line = l;
m->key = l->key;
if(nn > 1 && kcmp(mmp[0]->key, mmp[1]->key) > 0)
if(nn > 1 && Kcmp(mmp[0]->key, mmp[1]->key) > 0)
break;
}
}
Expand All @@ -485,7 +485,7 @@ mergefiles(int t, int n, Biobuf *b)
}

int
kcmp(Key *ka, Key *kb)
Kcmp(Key *ka, Key *kb)
{
int n, m;

Expand All @@ -511,7 +511,7 @@ printout(Biobuf *b)
ok = 0;
for(n=args.nline; n>0; n--) {
l = *lp++;
if(args.uflag && ok && kcmp(ok, l->key) == 0)
if(args.uflag && ok && Kcmp(ok, l->key) == 0)
continue;
lineout(b, l);
ok = l->key;
Expand Down
Loading