X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=blobdiff_plain;f=lib%2Fnflags-net.c;h=761faedcd59762e60904430e648f66d9d67cd8da;hp=00e6e45c93ee59126ce4ea9c7ae8ec46a8174523;hb=2822ba293eb308225c50d346930c47bf98d9927b;hpb=2894fc5a4c8335e4d7221311fed0556f33f8047c

diff --git a/lib/nflags-net.c b/lib/nflags-net.c
index 00e6e45..761faed 100644
--- a/lib/nflags-net.c
+++ b/lib/nflags-net.c
@@ -1,4 +1,4 @@
-// $Id: nflags-net.c 2404 2006-11-25 00:38:30Z dhozac $    --*- c -*--
+// $Id: nflags-net.c,v 1.2 2005/04/24 20:25:17 ensc Exp $    --*- c -*--
 
 // Copyright (C) 2004 Enrico Scholz <ensc@delenn.intern.sigma-chemnitz.de>
 //  
@@ -25,47 +25,19 @@
 #include <lib_internal/util-dimof.h>
 
 #include <string.h>
-#include <strings.h>
 #include <assert.h>
 
 #define DECL(STR, VAL) { STR, sizeof(STR)-1, VAL }
 
 static struct Mapping_uint64 const VALUES[] = {
-  DECL("lock",		VC_NXF_INFO_LOCK),
-  DECL("private",	VC_NXF_INFO_PRIVATE),
-
-  DECL("single_ip",	VC_NXF_SINGLE_IP),
-
-  DECL("hide_netif",	VC_NXF_HIDE_NETIF),
-
-  DECL("state_setup",	VC_NXF_STATE_SETUP),
-  DECL("state_admin",	VC_NXF_STATE_ADMIN),
-
-  DECL("sc_helper",	VC_NXF_SC_HELPER),
-  DECL("persistent",	VC_NXF_PERSISTENT),
-
-    // Aliases for the legacy flags
-  DECL("info_lock",	VC_NXF_INFO_LOCK),
-  DECL("info_private",	VC_NXF_INFO_PRIVATE),
+#warning Add the 'nflags' values here
+  DECL("", 0)
 };
 
-inline static char const *
-removePrefix(char const *str, size_t *len)
-{
-  if ((len==0 || *len==0 || *len>4) &&
-      strncasecmp("nxf_", str, 4)==0) {
-    if (len && *len>4) *len -= 4;
-    return str+4;
-  }
-  else
-    return str;
-}
-
 uint_least64_t
 vc_text2nflag(char const *str, size_t len)
 {
-  char const *	tmp = removePrefix(str, &len);
-  ssize_t	idx = utilvserver_value2text_uint64(tmp, len,
+  ssize_t	idx = utilvserver_value2text_uint64(str, len,
 						    VALUES, DIM_OF(VALUES));
   if (idx==-1) return 0;
   else         return VALUES[idx].val;