=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rlog.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- src/usr.bin/rcs/rlog.c 2006/04/25 13:36:36 1.50 +++ src/usr.bin/rcs/rlog.c 2006/04/26 02:55:13 1.51 @@ -1,4 +1,4 @@ -/* $OpenBSD: rlog.c,v 1.50 2006/04/25 13:36:36 xsa Exp $ */ +/* $OpenBSD: rlog.c,v 1.51 2006/04/26 02:55:13 joris Exp $ */ /* * Copyright (c) 2005 Joris Vink * Copyright (c) 2005, 2006 Xavier Santolaria @@ -250,7 +250,7 @@ int i, found; struct tm t; char *author, numb[64], *fmt, timeb[64]; - struct cvs_argvector *largv, *sargv, *wargv; + struct rcs_argvector *largv, *sargv, *wargv; i = found = 0; author = NULL; @@ -264,7 +264,7 @@ /* if locker is empty, no need to go further. */ if (rdp->rd_locker == NULL) return; - largv = cvs_strsplit(llist, ","); + largv = rcs_strsplit(llist, ","); for (i = 0; largv->argv[i] != NULL; i++) { if (strcmp(rdp->rd_locker, largv->argv[i]) == 0) { @@ -273,13 +273,13 @@ } found = 0; } - cvs_argv_destroy(largv); + rcs_argv_destroy(largv); } } /* -sstates */ if (slist != NULL) { - sargv = cvs_strsplit(slist, ","); + sargv = rcs_strsplit(slist, ","); for (i = 0; sargv->argv[i] != NULL; i++) { if (strcmp(rdp->rd_state, sargv->argv[i]) == 0) { found++; @@ -287,13 +287,13 @@ } found = 0; } - cvs_argv_destroy(sargv); + rcs_argv_destroy(sargv); } /* -w[logins] */ if (wflag == 1) { if (wlist != NULL) { - wargv = cvs_strsplit(wlist, ","); + wargv = rcs_strsplit(wlist, ","); for (i = 0; wargv->argv[i] != NULL; i++) { if (strcmp(rdp->rd_author, wargv->argv[i]) == 0) { @@ -302,7 +302,7 @@ } found = 0; } - cvs_argv_destroy(wargv); + rcs_argv_destroy(wargv); } else { if ((author = getlogin()) == NULL) err(1, "getlogin");