Changeset 550
- Timestamp:
- 02/20/07 13:27:49 (2 years ago)
- Files:
-
- trunk/src/vcc/vce/dx_limit.c (modified) (3 diffs)
- trunk/src/vcc/vce/init.c (modified) (2 diffs)
- trunk/src/vcc/vce/list.c (modified) (1 diff)
- trunk/src/vcc/vce/mount.c (modified) (3 diffs)
- trunk/src/vcc/vce/nx_addr.c (modified) (4 diffs)
- trunk/src/vcc/vce/nx_broadcast.c (modified) (2 diffs)
- trunk/src/vcc/vce/vx_bcaps.c (modified) (3 diffs)
- trunk/src/vcc/vce/vx_ccaps.c (modified) (3 diffs)
- trunk/src/vcc/vce/vx_flags.c (modified) (3 diffs)
- trunk/src/vcc/vce/vx_limit.c (modified) (3 diffs)
- trunk/src/vcc/vce/vx_sched.c (modified) (3 diffs)
- trunk/src/vcc/vce/vx_uname.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/vcc/vce/dx_limit.c
r547 r550 31 31 xmlrpc_value *response; 32 32 33 if (argc < 1) 34 usage(EXIT_FAILURE); 35 36 char *name = argv[0]; 37 33 38 response = client_call("vxdb.dx.limit.get", 34 39 "{s:s}", … … 51 56 void cmd_dx_limit_remove(xmlrpc_env *env, int argc, char **argv) 52 57 { 58 if (argc < 1) 59 usage(EXIT_FAILURE); 60 61 char *name = argv[0]; 62 53 63 client_call("vxdb.dx.limit.remove", 54 64 "{s:s}", … … 58 68 void cmd_dx_limit_set(xmlrpc_env *env, int argc, char **argv) 59 69 { 60 char * space, *inodes;70 char *name, *space, *inodes; 61 71 int reserved; 62 72 63 if (argc < 3)73 if (argc < 4) 64 74 usage(EXIT_FAILURE); 65 75 66 space = argv[0]; 67 inodes = argv[1]; 68 sscanf(argv[2], "%d", &reserved); 76 name = argv[0]; 77 space = argv[1]; 78 inodes = argv[2]; 79 sscanf(argv[3], "%d", &reserved); 69 80 70 81 client_call("vxdb.dx.limit.set", trunk/src/vcc/vce/init.c
r547 r550 30 30 xmlrpc_value *response; 31 31 32 response = client_call("vxdb.init.get", 33 "{s:s}", 34 "name", name); 32 if (argc < 1) 33 usage(EXIT_FAILURE); 34 35 char *name = argv[0]; 36 37 response = client_call("vxdb.init.get", "{s:s}", "name", name); 35 38 return_if_fault(env); 36 39 … … 56 59 int timeout; 57 60 58 if (argc > 0) 59 init = argv[0]; 61 if (argc < 1) 62 usage(EXIT_FAILURE); 63 64 char *name = argv[0]; 65 66 if (argc > 1) 67 init = argv[1]; 60 68 else 61 69 init = ""; 62 70 63 if (argc > 1)64 halt = argv[ 1];71 if (argc > 2) 72 halt = argv[2]; 65 73 else 66 74 halt = ""; 67 75 68 if (argc > 2)69 reboot = argv[ 2];76 if (argc > 3) 77 reboot = argv[3]; 70 78 else 71 79 reboot = ""; 72 80 73 if (argc > 3)74 sscanf(argv[ 3], "%d", &timeout);81 if (argc > 4) 82 sscanf(argv[4], "%d", &timeout); 75 83 else 76 84 timeout = 0; 77 85 78 client_call("vxdb.init.set", 79 "{s:s,s:s,s:s,s:s,s:i}", 86 client_call("vxdb.init.set", "{s:s,s:s,s:s,s:s,s:i}", 80 87 "name", name, 81 88 "init", init, trunk/src/vcc/vce/list.c
r547 r550 24 24 { 25 25 xmlrpc_value *response, *result; 26 char *username ;26 char *username = ""; 27 27 int len, i; 28 29 if (argc > 0) 30 username = argv[0]; 28 31 29 32 response = client_call("vxdb.list", 30 33 "{s:s}", 31 "username", name);34 "username", username); 32 35 return_if_fault(env); 33 36 trunk/src/vcc/vce/mount.c
r547 r550 30 30 31 31 if (argc < 1) 32 usage(EXIT_FAILURE); 33 34 char *name = argv[0]; 35 36 if (argc < 2) 32 37 dst = ""; 33 38 else 34 dst = argv[ 0];39 dst = argv[1]; 35 40 36 response = client_call("vxdb.mount.get", 37 "{s:s,s:s}", 41 response = client_call("vxdb.mount.get", "{s:s,s:s}", 38 42 "name", name, 39 43 "dst", dst); … … 68 72 69 73 if (argc < 1) 74 usage(EXIT_FAILURE); 75 76 char *name = argv[0]; 77 78 if (argc < 2) 70 79 dst = ""; 71 80 else 72 dst = argv[ 0];81 dst = argv[1]; 73 82 74 client_call("vxdb.mount.remove", 75 "{s:s,s:s}", 83 client_call("vxdb.mount.remove", "{s:s,s:s}", 76 84 "name", name, 77 85 "dst", dst); … … 80 88 void cmd_mount_set(xmlrpc_env *env, int argc, char **argv) 81 89 { 82 char * src, *dst, *type, *opts;90 char *name, *src, *dst, *type, *opts; 83 91 84 if (argc < 2)92 if (argc < 3) 85 93 usage(EXIT_FAILURE); 86 94 87 src = argv[0]; 88 dst = argv[1]; 95 name = argv[0]; 96 src = argv[1]; 97 dst = argv[2]; 89 98 90 if (argc > 2)91 type = argv[ 2];99 if (argc > 3) 100 type = argv[3]; 92 101 else 93 102 type = ""; 94 103 95 if (argc > 3)96 opts = argv[ 3];104 if (argc > 4) 105 opts = argv[4]; 97 106 else 98 107 opts = ""; 99 108 100 client_call("vxdb.mount.set", 101 "{s:s,s:s,s:s,s:s,s:s}", 109 client_call("vxdb.mount.set", "{s:s,s:s,s:s,s:s,s:s}", 102 110 "name", name, 103 111 "src", src, trunk/src/vcc/vce/nx_addr.c
r547 r550 30 30 31 31 if (argc < 1) 32 usage(EXIT_FAILURE); 33 34 char *name = argv[0]; 35 36 if (argc < 2) 32 37 addr = ""; 33 38 else 34 addr = argv[ 0];39 addr = argv[1]; 35 40 36 response = client_call("vxdb.nx.addr.get", 37 "{s:s,s:s}", 41 response = client_call("vxdb.nx.addr.get", "{s:s,s:s}", 38 42 "name", name, 39 43 "addr", addr); … … 66 70 67 71 if (argc < 1) 72 usage(EXIT_FAILURE); 73 74 char *name = argv[0]; 75 76 if (argc < 2) 68 77 addr = ""; 69 78 else 70 addr = argv[ 0];79 addr = argv[1]; 71 80 72 client_call("vxdb.nx.addr.remove", 73 "{s:s,s:s}", 81 client_call("vxdb.nx.addr.remove", "{s:s,s:s}", 74 82 "name", name, 75 83 "addr", addr); … … 79 87 { 80 88 xmlrpc_value *response, *result; 81 char * addr, *netmask = "255.255.255.255";89 char *name, *addr, *netmask = "255.255.255.255"; 82 90 83 if (argc < 1)91 if (argc < 2) 84 92 usage(EXIT_FAILURE); 85 93 86 addr = argv[0]; 94 name = argv[0]; 95 addr = argv[1]; 87 96 88 response = client_call("vxdb.nx.addr.get", 89 "{s:s,s:s}", 97 response = client_call("vxdb.nx.addr.get", "{s:s,s:s}", 90 98 "name", name, 91 99 "addr", addr); … … 108 116 netmask = argv[1]; 109 117 110 client_call("vxdb.nx.addr.set", 111 "{s:s,s:s,s:s}", 118 client_call("vxdb.nx.addr.set", "{s:s,s:s,s:s}", 112 119 "name", name, 113 120 "addr", addr, trunk/src/vcc/vce/nx_broadcast.c
r547 r550 29 29 char *broadcast; 30 30 31 response = client_call("vxdb.nx.broadcast.get", 32 "{s:s}", 33 "name", name); 31 if (argc < 1) 32 usage(EXIT_FAILURE); 33 34 char *name = argv[0]; 35 36 response = client_call("vxdb.nx.broadcast.get", "{s:s}", "name", name); 34 37 return_if_fault(env); 35 38 … … 43 46 void cmd_nx_broadcast_remove(xmlrpc_env *env, int argc, char **argv) 44 47 { 45 client_call("vxdb.nx.broadcast.remove", 46 "{s:s}", 47 "name", name); 48 if (argc < 1) 49 usage(EXIT_FAILURE); 50 51 char *name = argv[0]; 52 53 client_call("vxdb.nx.broadcast.remove", "{s:s}", "name", name); 48 54 } 49 55 50 56 void cmd_nx_broadcast_set(xmlrpc_env *env, int argc, char **argv) 51 57 { 52 char * broadcast;58 char *name, *broadcast; 53 59 54 if (argc < 1)60 if (argc < 2) 55 61 usage(EXIT_FAILURE); 56 62 57 broadcast = argv[0]; 63 name = argv[0]; 64 broadcast = argv[1]; 58 65 59 client_call("vxdb.nx.broadcast.set", 60 "{s:s,s:s}", 66 client_call("vxdb.nx.broadcast.set", "{s:s,s:s}", 61 67 "name", name, 62 68 "broadcast", broadcast); trunk/src/vcc/vce/vx_bcaps.c
r547 r550 25 25 void cmd_vx_bcaps_add(xmlrpc_env *env, int argc, char **argv) 26 26 { 27 char * bcap;27 char *name, *bcap; 28 28 29 if (argc < 1)29 if (argc < 2) 30 30 usage(EXIT_FAILURE); 31 31 32 bcap = argv[0]; 32 name = argv[0]; 33 bcap = argv[1]; 33 34 34 client_call("vxdb.vx.bcaps.add", 35 "{s:s,s:s}", 35 client_call("vxdb.vx.bcaps.add", "{s:s,s:s}", 36 36 "name", name, 37 37 "bcap", bcap); … … 44 44 int len, i; 45 45 46 response = client_call("vxdb.vx.bcaps.get", 47 "{s:s}", 48 "name", name); 46 if (argc < 1) 47 usage(EXIT_FAILURE); 48 49 char *name = argv[0]; 50 51 response = client_call("vxdb.vx.bcaps.get", "{s:s}", "name", name); 49 52 return_if_fault(env); 50 53 … … 72 75 73 76 if (argc < 1) 77 usage(EXIT_FAILURE); 78 79 char *name = argv[0]; 80 81 if (argc < 2) 74 82 bcap = ""; 75 83 else 76 bcap = argv[ 0];84 bcap = argv[1]; 77 85 78 client_call("vxdb.vx.bcaps.remove", 79 "{s:s,s:s}", 86 client_call("vxdb.vx.bcaps.remove", "{s:s,s:s}", 80 87 "name", name, 81 88 "bcap", bcap); trunk/src/vcc/vce/vx_ccaps.c
r547 r550 25 25 void cmd_vx_ccaps_add(xmlrpc_env *env, int argc, char **argv) 26 26 { 27 char * ccap;27 char *name, *ccap; 28 28 29 if (argc < 1)29 if (argc < 2) 30 30 usage(EXIT_FAILURE); 31 31 32 ccap = argv[0]; 32 name = argv[0]; 33 ccap = argv[1]; 33 34 34 client_call("vxdb.vx.ccaps.add", 35 "{s:s,s:s}", 35 client_call("vxdb.vx.ccaps.add", "{s:s,s:s}", 36 36 "name", name, 37 37 "ccap", ccap); … … 44 44 int len, i; 45 45 46 response = client_call("vxdb.vx.ccaps.get", 47 "{s:s}", 48 "name", name); 46 if (argc < 1) 47 usage(EXIT_FAILURE); 48 49 char *name = argv[0]; 50 51 response = client_call("vxdb.vx.ccaps.get", "{s:s}", "name", name); 49 52 return_if_fault(env); 50 53 … … 72 75 73 76 if (argc < 1) 77 usage(EXIT_FAILURE); 78 79 char *name = argv[0]; 80 81 if (argc < 2) 74 82 ccap = ""; 75 83 else 76 ccap = argv[ 0];84 ccap = argv[1]; 77 85 78 client_call("vxdb.vx.ccaps.remove", 79 "{s:s,s:s}", 86 client_call("vxdb.vx.ccaps.remove", "{s:s,s:s}", 80 87 "name", name, 81 88 "ccap", ccap); trunk/src/vcc/vce/vx_flags.c
r547 r550 25 25 void cmd_vx_flags_add(xmlrpc_env *env, int argc, char **argv) 26 26 { 27 char * flag;27 char *name, *flag; 28 28 29 if (argc < 1)29 if (argc < 2) 30 30 usage(EXIT_FAILURE); 31 31 32 flag = argv[0]; 32 name = argv[0]; 33 flag = argv[1]; 33 34 34 client_call("vxdb.vx.flags.add", 35 "{s:s,s:s}", 35 client_call("vxdb.vx.flags.add", "{s:s,s:s}", 36 36 "name", name, 37 37 "flag", flag); … … 44 44 int len, i; 45 45 46 response = client_call("vxdb.vx.flags.get", 47 "{s:s}", 48 "name", name); 46 if (argc < 1) 47 usage(EXIT_FAILURE); 48 49 char *name = argv[0]; 50 51 response = client_call("vxdb.vx.flags.get", "{s:s}", "name", name); 49 52 return_if_fault(env); 50 53 … … 72 75 73 76 if (argc < 1) 77 usage(EXIT_FAILURE); 78 79 char *name = argv[0]; 80 81 if (argc < 2) 74 82 flag = ""; 75 83 else 76 flag = argv[ 0];84 flag = argv[1]; 77 85 78 client_call("vxdb.vx.flags.remove", 79 "{s:s,s:s}", 86 client_call("vxdb.vx.flags.remove", "{s:s,s:s}", 80 87 "name", name, 81 88 "flag", flag); trunk/src/vcc/vce/vx_limit.c
r547 r550 32 32 33 33 if (argc < 1) 34 usage(EXIT_FAILURE); 35 36 char *name = argv[0]; 37 38 if (argc < 2) 34 39 type = ""; 35 40 else 36 type = argv[ 0];41 type = argv[1]; 37 42 38 response = client_call("vxdb.vx.limit.get", 39 "{s:s,s:s}", 43 response = client_call("vxdb.vx.limit.get", "{s:s,s:s}", 40 44 "name", name, 41 45 "type", type); … … 69 73 70 74 if (argc < 1) 75 usage(EXIT_FAILURE); 76 77 char *name = argv[0]; 78 79 if (argc < 2) 71 80 type = ""; 72 81 else 73 type = argv[ 0];82 type = argv[1]; 74 83 75 client_call("vxdb.vx.limit.remove", 76 "{s:s,s:s}", 84 client_call("vxdb.vx.limit.remove", "{s:s,s:s}", 77 85 "name", name, 78 86 "type", type); … … 81 89 void cmd_vx_limit_set(xmlrpc_env *env, int argc, char **argv) 82 90 { 83 char * type;91 char *name, *type; 84 92 int soft, max; 85 93 86 if (argc < 2)94 if (argc < 3) 87 95 usage(EXIT_FAILURE); 88 96 89 type = argv[0]; 90 sscanf(argv[1], "%d", &soft); 97 name = argv[0]; 98 type = argv[1]; 99 sscanf(argv[2], "%d", &soft); 91 100 92 if (argc > 2)93 sscanf(argv[ 2], "%d", &max);101 if (argc > 3) 102 sscanf(argv[3], "%d", &max); 94 103 else 95 104 max = soft; 96 105 97 client_call("vxdb.vx.limit.set", 98 "{s:s,s:s,s:i,s:i}", 106 client_call("vxdb.vx.limit.set", "{s:s,s:s,s:i,s:i}", 99 107 "name", name, 100 108 "type", type, trunk/src/vcc/vce/vx_sched.c
r547 r550 32 32 33 33 if (argc < 1) 34 usage(EXIT_FAILURE); 35 36 char *name = argv[0]; 37 38 if (argc < 2) 34 39 cpuid = -2; 35 40 else 36 sscanf(argv[ 0], "%d", &cpuid);41 sscanf(argv[1], "%d", &cpuid); 37 42 38 response = client_call("vxdb.vx.sched.get", 39 "{s:s,s:i}", 43 response = client_call("vxdb.vx.sched.get", "{s:s,s:i}", 40 44 "name", name, 41 45 "cpuid", cpuid); … … 74 78 75 79 if (argc < 1) 80 usage(EXIT_FAILURE); 81 82 char *name = argv[0]; 83 84 if (argc < 2) 76 85 cpuid = -2; 77 86 else 78 sscanf(argv[ 0], "%d", &cpuid);87 sscanf(argv[1], "%d", &cpuid); 79 88 80 client_call("vxdb.vx.sched.remove", 81 "{s:s,s:i}", 89 client_call("vxdb.vx.sched.remove", "{s:s,s:i}", 82 90 "name", name, 83 91 "cpuid", cpuid); … … 89 97 int tokensmin, tokensmax, i = 0; 90 98 91 if (argc < 7)99 if (argc < 8) 92 100 usage(EXIT_FAILURE); 101 102 char *name = argv[i++]; 93 103 94 104 sscanf(argv[i++], "%d", &cpuid); trunk/src/vcc/vce/vx_uname.c
r547 r550 30 30 31 31 if (argc < 1) 32 usage(EXIT_FAILURE); 33 34 char *name = argv[0]; 35 36 if (argc < 2) 32 37 type = ""; 33 38 else 34 type = argv[ 0];39 type = argv[1]; 35 40 36 response = client_call("vxdb.vx.uname.get", 37 "{s:s,s:s}", 41 response = client_call("vxdb.vx.uname.get", "{s:s,s:s}", 38 42 "name", name, 39 43 "type", type); … … 66 70 67 71 if (argc < 1) 72 usage(EXIT_FAILURE); 73 74 char *name = argv[0]; 75 76 if (argc < 2) 68 77 type = ""; 69 78 else 70 type = argv[ 0];79 type = argv[1]; 71 80 72 client_call("vxdb.vx.uname.remove", 73 "{s:s,s:s}", 81 client_call("vxdb.vx.uname.remove", "{s:s,s:s}", 74 82 "name", name, 75 83 "type", type); … … 78 86 void cmd_vx_uname_set(xmlrpc_env *env, int argc, char **argv) 79 87 { 80 char * type, *value;88 char *name, *type, *value; 81 89 82 if (argc < 2)90 if (argc < 3) 83 91 usage(EXIT_FAILURE); 84 92 85 type = argv[0]; 86 value = argv[1]; 93 name = argv[0]; 94 type = argv[1]; 95 value = argv[2]; 87 96 88 client_call("vxdb.vx.uname.set", 89 "{s:s,s:s,s:s}", 97 client_call("vxdb.vx.uname.set", "{s:s,s:s,s:s}", 90 98 "name", name, 91 99 "type", type,
