[Cvs-nserver-commits] CVS: cvs-nserver/acl branch-acl.c,1.1.2.18,1.1.2.19 branch-acl.h,1.1.2.10,1.1.2.11 check_acl_admins.c,1.1.2.1,1.1.2.2 check_branch_acl.c,1.1.2.13,1.1.2.14 check_module_acl.c,1.1.2.2,1.1.2.3 check_repository.c,1.1.2.1,1.1.2.2 check_stringbuf.c,1.1.2.5,1.1.2.6 check_user_acl.c,1.1.2.2,1.1.2.3 check_user_groups.c,1.1.2.2,1.1.2.3 cvsgroup-internal.h,1.1.2.1,1.1.2.2 cvsgroup.c,1.1.2.3,1.1.2.4 cvsgroup.h,1.1.2.1,1.1.2.2 default-file-acl.c,1.1.2.1,1.1.2.2 default-file-acl.h,1.1.2.1,1.1.2.2 dir-acl.c,1.1.2.23,1.1.2.24 dir-acl.h,1.1.2.13,1.1.2.14 user-acl.c,1.1.2.5,1.1.2.6 user-acl.h,1.1.2.2,1.1.2.3

[Alexey M. <mo...@us...>]

Update of /cvsroot/cvs-nserver/cvs-nserver/acl
In directory usw-pr-cvs1:/tmp/cvs-serv11573

Modified Files:
      Tag: NCLI-1-11-1
	branch-acl.c branch-acl.h check_acl_admins.c 
	check_branch_acl.c check_module_acl.c check_repository.c 
	check_stringbuf.c check_user_acl.c check_user_groups.c 
	cvsgroup-internal.h cvsgroup.c cvsgroup.h default-file-acl.c 
	default-file-acl.h dir-acl.c dir-acl.h user-acl.c user-acl.h 
Log Message:
Headers inclusion/function declaration cleanups. Nothing significant. 


Index: branch-acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/branch-acl.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- branch-acl.c	9 Jun 2002 14:25:23 -0000	1.1.2.18
+++ branch-acl.c	13 Jun 2002 09:20:44 -0000	1.1.2.19
@@ -46,7 +46,7 @@
 
 
 BRANCH_ACL *
-find_branch_acl (DIR_ACL *dir_acl, char *branch)
+find_branch_acl (DIR_ACL *dir_acl, const char *branch)
 {
     struct BRANCH_ACL *current = dir_acl->branch_acls;
 
@@ -61,7 +61,7 @@
 }
 
 BRANCH_ACL *
-get_branch_acl (DIR_ACL *dir_acl, char *branch)
+get_branch_acl (DIR_ACL *dir_acl, const char *branch)
 {
     struct BRANCH_ACL *result;
 
@@ -77,7 +77,7 @@
 
 
 BRANCH_ACL *
-create_branch_acl (DIR_ACL *dir_acl, char *branch)
+create_branch_acl (DIR_ACL *dir_acl, const char *branch)
 {
     struct BRANCH_ACL *branch_acl;
 

Index: branch-acl.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/branch-acl.h,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- branch-acl.h	9 Jun 2002 14:25:23 -0000	1.1.2.10
+++ branch-acl.h	13 Jun 2002 09:20:44 -0000	1.1.2.11
@@ -55,9 +55,9 @@
 
 typedef int branch_permission;
 
-BRANCH_ACL *create_branch_acl (DIR_ACL *dir_acl, char *branch);
-BRANCH_ACL *find_branch_acl (DIR_ACL *dir_acl, char *branch);
-BRANCH_ACL *get_branch_acl (DIR_ACL *dir_acl, char *branch);
+BRANCH_ACL *create_branch_acl (DIR_ACL *dir_acl, const char *branch);
+BRANCH_ACL *find_branch_acl (DIR_ACL *dir_acl, const char *branch);
+BRANCH_ACL *get_branch_acl (DIR_ACL *dir_acl, const char *branch);
 
 BRANCH_ACE *get_file_on_branch_ace (BRANCH_ACL *branch_acl, char *file);
 

Index: check_acl_admins.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/check_acl_admins.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- check_acl_admins.c	30 Sep 2001 19:40:04 -0000	1.1.2.1
+++ check_acl_admins.c	13 Jun 2002 09:20:44 -0000	1.1.2.2
@@ -1,8 +1,11 @@
-
+#include "config.h"
 #include "acl-admins.h"
 
 #include <assert.h>
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#include <stdlib.h>
 
 int main (void)
 {

Index: check_branch_acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/check_branch_acl.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- check_branch_acl.c	7 Jun 2002 13:18:36 -0000	1.1.2.13
+++ check_branch_acl.c	13 Jun 2002 09:20:44 -0000	1.1.2.14
@@ -16,6 +16,7 @@
 */
 
 #include "branch-acl.h"
+#include "default-file-acl.h"
 #include "check_acl.h"
 #include "dir-acl.h"
 

Index: check_module_acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/check_module_acl.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- check_module_acl.c	21 Nov 2001 22:51:17 -0000	1.1.2.2
+++ check_module_acl.c	13 Jun 2002 09:20:44 -0000	1.1.2.3
@@ -14,11 +14,14 @@
    Test-suite for module-level Access Control Lists
 
 */
-
+#include "config.h"
 #include "module-acl.h"
 
 #include <assert.h>
 #include <stdlib.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 
 
 static void

Index: check_repository.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/check_repository.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- check_repository.c	13 Nov 2001 23:26:34 -0000	1.1.2.1
+++ check_repository.c	13 Jun 2002 09:20:44 -0000	1.1.2.2
@@ -14,11 +14,14 @@
    Test-suite for ACL-related repository handling
 
 */
-
+#include "config.h"
 #include "repository.h"
 
 #include <assert.h>
 #include <stdlib.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 
 int
 main (void)

Index: check_stringbuf.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/check_stringbuf.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- check_stringbuf.c	9 May 2002 15:09:11 -0000	1.1.2.5
+++ check_stringbuf.c	13 Jun 2002 09:20:44 -0000	1.1.2.6
@@ -15,11 +15,14 @@
 
 */
 
-
+#include "config.h"
 #include "stringbuf.h"
 
 #include <assert.h>
 #include <stdlib.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 
 static void
 test_NULL_stringbuf (void)

Index: check_user_acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/check_user_acl.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- check_user_acl.c	8 Sep 2001 23:04:36 -0000	1.1.2.2
+++ check_user_acl.c	13 Jun 2002 09:20:44 -0000	1.1.2.3
@@ -1,8 +1,11 @@
-
+#include "config.h"
 #include "user-acl.h"
 
 #include <assert.h>
 #include <stdlib.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 
 int
 main (void)

Index: check_user_groups.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/check_user_groups.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- check_user_groups.c	14 Apr 2002 18:36:29 -0000	1.1.2.2
+++ check_user_groups.c	13 Jun 2002 09:20:44 -0000	1.1.2.3
@@ -1,9 +1,16 @@
+#include "config.h"
 #include "cvsgroup.h"
 #include "cvsgroup-internal.h"
 
 #include <assert.h>
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 #include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <stdlib.h>
 
 static void
 check_creating_groups (void)

Index: cvsgroup-internal.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/cvsgroup-internal.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- cvsgroup-internal.h	29 Sep 2001 23:50:32 -0000	1.1.2.1
+++ cvsgroup-internal.h	13 Jun 2002 09:20:44 -0000	1.1.2.2
@@ -10,17 +10,17 @@
     int users_count;
 };
 
-int internal_add_user_to_group (char *username, struct cvsgroup *cvsgroup);
-int add_user_to_group (char *username, char *groupname);
+int internal_add_user_to_group (const char *username, struct cvsgroup *cvsgroup);
+int add_user_to_group (const char *username, const char *groupname);
 
-int internal_user_in_group (char *username, struct cvsgroup *cvsgroup);
+int internal_user_in_group (const char *username, struct cvsgroup *cvsgroup);
 
 
-struct cvsgroup *create_cvsgroup (char *groupname);
+struct cvsgroup *create_cvsgroup (const char *groupname);
 
 void free_cvsgroup (struct cvsgroup *group);
 
-struct cvsgroup *get_cvsgroup (char *groupname);
+struct cvsgroup *get_cvsgroup (const char *groupname);
 
 void clear_groups(void);
 

Index: cvsgroup.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/cvsgroup.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- cvsgroup.c	14 Apr 2002 18:36:29 -0000	1.1.2.3
+++ cvsgroup.c	13 Jun 2002 09:20:44 -0000	1.1.2.4
@@ -21,7 +21,7 @@
 static struct group_elem *first_group_elem = NULL;
 
 struct cvsgroup *
-get_cvsgroup (char *group)
+get_cvsgroup (const char *group)
 {
     struct group_elem *current = first_group_elem;
 
@@ -35,7 +35,7 @@
 }
 
 struct cvsgroup *
-create_cvsgroup (char *group)
+create_cvsgroup (const char *group)
 {
     struct cvsgroup *result;
     struct group_elem *group_elem;
@@ -97,7 +97,7 @@
 
 
 int
-add_user_to_group (char *username, char *group)
+add_user_to_group (const char *username, const char *group)
 {
     struct cvsgroup *cvsgroup;
 
@@ -117,7 +117,7 @@
 #define ALLOC_DELTA 8
 
 int
-internal_add_user_to_group (char *username, struct cvsgroup *cvsgroup)
+internal_add_user_to_group (const char *username, struct cvsgroup *cvsgroup)
 {
     char **new_users;
     char *username_copy;
@@ -248,7 +248,7 @@
 
 
 int
-internal_user_in_group (char *username, struct cvsgroup *cvsgroup)
+internal_user_in_group (const char *username, struct cvsgroup *cvsgroup)
 {
     char **users;
     if (cvsgroup->users == NULL)
@@ -264,7 +264,7 @@
 
 
 int
-user_in_group (char *username, char *group)
+user_in_group (const char *username, const char *group)
 {
     struct cvsgroup *cvsgroup;
 

Index: cvsgroup.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/cvsgroup.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- cvsgroup.h	29 Sep 2001 23:50:32 -0000	1.1.2.1
+++ cvsgroup.h	13 Jun 2002 09:20:44 -0000	1.1.2.2
@@ -4,6 +4,6 @@
 
 int read_cvsgroup_file (char *filename);
 
-int user_in_group (char *username, char *groupname);
+int user_in_group (const char *username, const char *groupname);
 
 #endif /* CVSGROUP_H */

Index: default-file-acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/default-file-acl.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- default-file-acl.c	9 Jun 2002 12:07:53 -0000	1.1.2.1
+++ default-file-acl.c	13 Jun 2002 09:20:44 -0000	1.1.2.2
@@ -41,7 +41,7 @@
 
 
 static struct DEFAULT_FILE_ACL *
-get_default_file_acl (struct DIR_ACL *dir_acl, char *branch)
+get_default_file_acl (struct DIR_ACL *dir_acl, const char *branch)
 {
     struct DEFAULT_FILE_ACL *current = dir_acl->default_file_acl;
 
@@ -56,7 +56,7 @@
 }
 
 struct USER_ACL *
-get_default_file_user_acl (struct DIR_ACL *dir_acl, char *branch)
+get_default_file_user_acl (struct DIR_ACL *dir_acl, const char *branch)
 {
     struct DEFAULT_FILE_ACL *dfa = get_default_file_acl(dir_acl, branch);
     if (dfa == NULL)
@@ -66,7 +66,7 @@
 }
 
 int
-set_default_file_acl (struct DIR_ACL *dir_acl, char *branch, char *username, int perm)
+set_default_file_acl (struct DIR_ACL *dir_acl, const char *branch, const char *username, int perm)
 {
     struct DEFAULT_FILE_ACL *dfa;
     struct USER_ACL *new_acls;

Index: default-file-acl.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/default-file-acl.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- default-file-acl.h	9 Jun 2002 12:07:53 -0000	1.1.2.1
+++ default-file-acl.h	13 Jun 2002 09:20:44 -0000	1.1.2.2
@@ -40,9 +40,9 @@
 
 int store_default_file_acl (FILE *acl_file, struct DEFAULT_FILE_ACL *dfacl);
 
-int set_default_file_acl (struct DIR_ACL *dir_acl, char *branch, char *username, int perm);
+int set_default_file_acl (struct DIR_ACL *dir_acl,const char *branch, const char *username, int perm);
 
-struct USER_ACL *get_default_file_user_acl(struct DIR_ACL *dir_acl, char *branch);
+struct USER_ACL *get_default_file_user_acl(struct DIR_ACL *dir_acl, const char *branch);
 
 #endif /* DEFAULT_FILE_ACL_H__ */
 

Index: dir-acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/dir-acl.c,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -d -r1.1.2.23 -r1.1.2.24
--- dir-acl.c	9 Jun 2002 12:07:53 -0000	1.1.2.23
+++ dir-acl.c	13 Jun 2002 09:20:44 -0000	1.1.2.24
@@ -129,12 +129,12 @@
     return current_default_dir_perm;
 }
 
-static struct DIR_ACL *create_and_load_dir_acl (char *dir);
+static struct DIR_ACL *create_and_load_dir_acl (const char *dir);
 static struct DIR_ACL *add_dir_acl_topdirs (char *dir, struct DIR_ACL *the_dir_acl);
 
 
 struct DIR_ACL *
-get_dir_acl (char *dir, char *branch)
+get_dir_acl (const char *dir, const char *branch)
 {
     struct DIR_ACL *dir_acl = NULL;
     char *dir_copy = NULL;
@@ -268,7 +268,7 @@
  */
 
 static struct DIR_ACL*
-create_dir_acl (char* dir)
+create_dir_acl (const char* dir)
 {
     struct DIR_ACL* dir_acl = calloc(1, sizeof(struct DIR_ACL));
     if (dir_acl == NULL)
@@ -324,7 +324,7 @@
  */
 
 static struct DIR_ACL *
-create_and_load_dir_acl (char *dir)
+create_and_load_dir_acl (const char *dir)
 {
     FILE *acl = NULL;
     struct DIR_ACL *dir_acl = NULL;

Index: dir-acl.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/dir-acl.h,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- dir-acl.h	9 Jun 2002 12:07:53 -0000	1.1.2.13
+++ dir-acl.h	13 Jun 2002 09:20:44 -0000	1.1.2.14
@@ -104,7 +104,7 @@
 void set_default_dir_perm (enum DIR_PERM new_perm);
 enum DIR_PERM get_default_dir_perm (void);
 
-struct DIR_ACL *get_dir_acl(char *dir, char *branch);
+struct DIR_ACL *get_dir_acl(const char *dir, const char *branch);
 void destroy_dir_acl (struct DIR_ACL* dir_acl);
 
 

Index: user-acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/user-acl.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- user-acl.c	9 Jun 2002 11:41:50 -0000	1.1.2.5
+++ user-acl.c	13 Jun 2002 09:20:44 -0000	1.1.2.6
@@ -51,7 +51,7 @@
 
 
 USER_ACE *
-get_user_ace (USER_ACL *acls, char *username)
+get_user_ace (USER_ACL *acls, const char *username)
 {
     USER_ACL *acl = acls;
 
@@ -69,7 +69,7 @@
 }
 
 USER_ACL *
-set_user_ace (USER_ACL *acls, char *username, int perm)
+set_user_ace (USER_ACL *acls, const char *username, int perm)
 {
     USER_ACL *acl = acls;
 

Index: user-acl.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/user-acl.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- user-acl.h	9 Jun 2002 11:41:50 -0000	1.1.2.2
+++ user-acl.h	13 Jun 2002 09:20:44 -0000	1.1.2.3
@@ -31,8 +31,8 @@
 
 void free_user_acls (USER_ACL* acls);
 
-USER_ACL * set_user_ace(USER_ACL *acls, char *username, int perm);
+USER_ACL * set_user_ace(USER_ACL *acls, const char *username, int perm);
 
-USER_ACE * get_user_ace (USER_ACL *acls, char *username);
+USER_ACE * get_user_ace (USER_ACL *acls, const char *username);
 
 #endif /* USER_ACL_H */