summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/cvs/cvs/find_names.c
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/cvs/cvs/find_names.c')
-rw-r--r--gnu/usr.bin/cvs/cvs/find_names.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/gnu/usr.bin/cvs/cvs/find_names.c b/gnu/usr.bin/cvs/cvs/find_names.c
index a77807bc6321..82959b5754b9 100644
--- a/gnu/usr.bin/cvs/cvs/find_names.c
+++ b/gnu/usr.bin/cvs/cvs/find_names.c
@@ -19,8 +19,8 @@
#include "cvs.h"
#ifndef lint
-static char rcsid[] = "$CVSid: @(#)find_names.c 1.45 94/10/22 $";
-USE(rcsid)
+static const char rcsid[] = "$CVSid: @(#)find_names.c 1.45 94/10/22 $";
+USE(rcsid);
#endif
static int find_dirs PROTO((char *dir, List * list, int checkadm));
@@ -31,6 +31,7 @@ static List *filelist;
/*
* add the key from entry on entries list to the files list
*/
+static int add_entries_proc PROTO((Node *, void *));
static int
add_entries_proc (node, closure)
Node *node;
@@ -49,9 +50,11 @@ add_entries_proc (node, closure)
/*
* compare two files list node (for sort)
*/
+static int fsortcmp PROTO ((const Node *, const Node *));
static int
fsortcmp (p, q)
- Node *p, *q;
+ const Node *p;
+ const Node *q;
{
return (strcmp (p->key, q->key));
}
@@ -74,8 +77,7 @@ Find_Names (repository, which, aflag, optentries)
if (which & W_LOCAL)
{
/* parse the entries file (if it exists) */
- entries = ParseEntries (aflag);
-
+ entries = Entries_Open (aflag);
if (entries != NULL)
{
/* walk the entries file adding elements to the files list */
@@ -85,7 +87,7 @@ Find_Names (repository, which, aflag, optentries)
if (optentries != NULL)
*optentries = entries;
else
- dellist (&entries);
+ Entries_Close (entries);
}
}
@@ -258,12 +260,7 @@ find_dirs (dir, list, checkadm)
/* check for new style */
(void) sprintf (tmp, "%s/%s/%s", dir, dp->d_name, CVSADM);
if (!isdir (tmp))
- {
- /* and old style */
- (void) sprintf (tmp, "%s/%s/%s", dir, dp->d_name, OCVSADM);
- if (!isdir (tmp))
- continue;
- }
+ continue;
}
/* put it in the list */