[Cvs-nserver-commits] CVS: cvs-nserver/acl branch-acl.c,1.1.2.20,1.1.2.21

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

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

Modified Files:
      Tag: NCLI-1-11-1
	branch-acl.c 
Log Message:
After long and hot discussion w/ Alex falling back to direct permissions
manipulations :-)


Index: branch-acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/branch-acl.c,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -d -r1.1.2.20 -r1.1.2.21
--- branch-acl.c	20 Jun 2002 15:55:43 -0000	1.1.2.20
+++ branch-acl.c	20 Jun 2002 16:53:53 -0000	1.1.2.21
@@ -229,32 +229,20 @@
     return perm;
 }
 
-static const char *BRANCH_PERM_NONE_STRING        = "none";
-static const char *BRANCH_PERM_CHECKOUT_STRING    = "checkout";
-static const char *BRANCH_PERM_CHECKOUT_ALIAS     = "co";
-static const char *BRANCH_PERM_CHECKIN_STRING     = "checkin";
-static const char *BRANCH_PERM_CHECKIN_ALIAS      = "ci";
-static const char *BRANCH_PERM_CHECKOUTIN_STRING  = "checkout,checkin";
-static const char *BRANCH_PERM_INVALID_STRING     = "invalid";
-
 int
 parse_branch_permissions (char *perm_str)
 {
     size_t len;
     branch_permission res = branch_perm_none;
 
-    if (strcmp(perm_str, BRANCH_PERM_NONE_STRING) == 0)
+    if (strcmp(perm_str, "none") == 0)
 	return branch_perm_none;
     
-    if (strncmp(perm_str, BRANCH_PERM_CHECKOUT_STRING,
-		(len = strlen(BRANCH_PERM_CHECKOUT_STRING))) == 0 ||
-	strncmp(perm_str, BRANCH_PERM_CHECKOUT_ALIAS,
-		(len = strlen(BRANCH_PERM_CHECKOUT_ALIAS)))==0)
+    if (strncmp(perm_str, "checkout", (len = strlen("checkout"))) == 0 ||
+	strncmp(perm_str, "co", (len = strlen("co")))==0)
 	res |= branch_perm_checkout;
-    else if (strncmp(perm_str, BRANCH_PERM_CHECKIN_STRING,
-		(len = strlen(BRANCH_PERM_CHECKIN_STRING))) == 0 ||
-	     strncmp(perm_str, BRANCH_PERM_CHECKIN_ALIAS,
-		     (len = strlen(BRANCH_PERM_CHECKIN_ALIAS)))==0)
+    else if (strncmp(perm_str, "checkin", (len = strlen("checkin"))) == 0 ||
+	     strncmp(perm_str, "ci", (len = strlen("ci")))==0)
 	res |= branch_perm_checkin;
     else
 	return branch_perm_invalid;
@@ -268,12 +256,10 @@
     perm_str++;
 
     if ((!(res & branch_perm_checkout)) &&
-	(strcmp(perm_str, BRANCH_PERM_CHECKOUT_STRING) == 0 ||
-	 strcmp(perm_str, BRANCH_PERM_CHECKOUT_ALIAS)==0))
+	(strcmp(perm_str, "checkout") == 0 || strcmp(perm_str, "co")==0))
 	res |= branch_perm_checkout;
     else if ((!(res & branch_perm_checkin)) &&
-	     (strcmp(perm_str, BRANCH_PERM_CHECKIN_STRING) == 0 ||
-	      strcmp(perm_str, BRANCH_PERM_CHECKIN_ALIAS)==0))
+	     (strcmp(perm_str, "checkin") == 0 || strcmp(perm_str, "ci")==0))
 	res |= branch_perm_checkin;
     else
 	return branch_perm_invalid;
@@ -285,17 +271,17 @@
 branch_permissions_string (int perm)
 {
     if (perm == branch_perm_none)
-	return BRANCH_PERM_NONE_STRING;
+	return "none";
 
     if (perm == branch_perm_checkin)
-	return BRANCH_PERM_CHECKIN_STRING;
+	return "checkin";
 
     if (perm == branch_perm_checkout)
-	return BRANCH_PERM_CHECKOUT_STRING;
+	return "checkout";
 
     if (perm == (branch_perm_checkin | branch_perm_checkout))
-	return BRANCH_PERM_CHECKOUTIN_STRING;
+	return "checkout,checkin";
 
-    return BRANCH_PERM_INVALID_STRING;
+    return "invalid";
 }