Changeset 586
- Timestamp:
- 05/14/07 02:14:26 (2 years ago)
- Files:
-
- trunk/TODO (modified) (1 diff)
- trunk/src/vcc/vcc/create.c (modified) (2 diffs)
- trunk/src/vcc/vcc/exec.c (modified) (2 diffs)
- trunk/src/vcc/vcc/kill.c (modified) (2 diffs)
- trunk/src/vcc/vcc/list.c (modified) (1 diff)
- trunk/src/vcc/vcc/login.c (modified) (3 diffs)
- trunk/src/vcc/vcc/reboot.c (modified) (1 diff)
- trunk/src/vcc/vcc/remove.c (modified) (1 diff)
- trunk/src/vcc/vcc/rename.c (modified) (1 diff)
- trunk/src/vcc/vcc/restart.c (modified) (2 diffs)
- trunk/src/vcc/vcc/start.c (modified) (1 diff)
- trunk/src/vcc/vcc/status.c (modified) (2 diffs)
- trunk/src/vcc/vcc/stop.c (modified) (1 diff)
- trunk/src/vcc/vcc/templates.c (modified) (2 diffs)
- trunk/src/vcc/vcdadm/status.c (modified) (1 diff)
- trunk/src/vcc/vcdadm/user.c (modified) (5 diffs)
- trunk/src/vcc/vcdadm/user_caps.c (modified) (3 diffs)
- trunk/src/vcc/vce/dx_limit.c (modified) (3 diffs)
- trunk/src/vcc/vce/init.c (modified) (3 diffs)
- trunk/src/vcc/vce/list.c (modified) (1 diff)
- trunk/src/vcc/vce/mount.c (modified) (4 diffs)
- trunk/src/vcc/vce/nx_addr.c (modified) (5 diffs)
- trunk/src/vcc/vce/nx_broadcast.c (modified) (3 diffs)
- trunk/src/vcc/vce/vx_bcaps.c (modified) (4 diffs)
- trunk/src/vcc/vce/vx_ccaps.c (modified) (4 diffs)
- trunk/src/vcc/vce/vx_flags.c (modified) (4 diffs)
- trunk/src/vcc/vce/vx_limit.c (modified) (4 diffs)
- trunk/src/vcc/vce/vx_sched.c (modified) (6 diffs)
- trunk/src/vcc/vce/vx_uname.c (modified) (4 diffs)
- trunk/src/vcc/vgc/vg.c (modified) (3 diffs)
- trunk/src/vcc/vgc/vx.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/TODO
r574 r586 8 8 NEEDED FEATURES: 9 9 - debian/ dir, RPM .spec file, init scripts (done for Gentoo!), distrib make targets, pathprog probably 10 - support _ and - in vserver names (needs a new string checking function in Lucid) 10 11 11 12 WANTED FEATURES: trunk/src/vcc/vcc/create.c
r548 r586 25 25 void cmd_create(xmlrpc_env *env, int argc, char **argv) 26 26 { 27 char *name, *template, *vdir = "";27 char *name, *template, *vdir; 28 28 int force = 0, copy = 0; 29 29 … … 42 42 if (argc > 4) 43 43 vdir = argv[4]; 44 else 45 vdir = ""; 44 46 45 client_call("vx.create", "{s:s,s:s,s:b,s:b,s:s}", 46 "name", name, 47 "template", template, 48 "force", force, 49 "copy", copy, 50 "vdir", vdir); 47 client_call("vx.create", 48 "{s:s,s:s,s:b,s:b,s:s}", 49 "name", name, 50 "template", template, 51 "force", force, 52 "copy", copy, 53 "vdir", vdir); 51 54 } trunk/src/vcc/vcc/exec.c
r548 r586 43 43 log_perror_and_die("strtok_tostr"); 44 44 45 result = client_call("vx.exec", "{s:s,s:s}", "name", name, 46 "command", command); 45 result = client_call("vx.exec", 46 "{s:s,s:s}", 47 "name", name, 48 "command", command); 47 49 return_if_fault(env); 48 50 … … 50 52 return_if_fault(env); 51 53 52 printf("%s ", output);54 printf("%s\n", output); 53 55 54 56 xmlrpc_DECREF(result); trunk/src/vcc/vcc/kill.c
r548 r586 25 25 void cmd_kill(xmlrpc_env *env, int argc, char **argv) 26 26 { 27 char *name; 27 28 int pid = 0, sig = 0; 28 29 … … 30 31 usage(EXIT_FAILURE); 31 32 32 char *name = argv[0]; 33 33 name = argv[0]; 34 34 sscanf(argv[1], "%d", &pid); 35 35 sscanf(argv[2], "%d", &sig); 36 36 37 client_call("vx.kill", "{s:s,s:i,s:i}", 38 "name", name, 39 "pid", pid, 40 "sig", sig); 37 client_call("vx.kill", 38 "{s:s,s:i,s:i}", 39 "name", name, 40 "pid", pid, 41 "sig", sig); 41 42 } trunk/src/vcc/vcc/list.c
r548 r586 24 24 { 25 25 xmlrpc_value *response, *result; 26 char *username = "";26 char *username; 27 27 int len, i; 28 28 29 29 if (argc > 0) 30 30 username = argv[0]; 31 else 32 username = ""; 31 33 32 response = client_call("vxdb.list", "{s:s}", "username", username); 34 response = client_call("vxdb.list", 35 "{s:s}", 36 "username", username); 33 37 return_if_fault(env); 34 38 trunk/src/vcc/vcc/login.c
r548 r586 38 38 name = argv[0]; 39 39 40 result = client_call("vxdb.xid.get", "{s:s}", "name", name); 40 result = client_call("vxdb.xid.get", 41 "{s:s}", 42 "name", name); 41 43 return_if_fault(env); 42 44 … … 46 48 xmlrpc_DECREF(result); 47 49 48 result = client_call("vxdb.vdir.get", "{s:s}", "name", name); 50 result = client_call("vxdb.vdir.get", 51 "{s:s}", 52 "name", name); 49 53 return_if_fault(env); 50 54 … … 55 59 56 60 if (ns_enter(xid, 0) == -1) 57 log_perror_and_die(" vx_enter_namespace");61 log_perror_and_die("ns_enter"); 58 62 59 63 if (chroot_secure_chdir(vdir, "/") == -1) trunk/src/vcc/vcc/reboot.c
r548 r586 23 23 void cmd_reboot(xmlrpc_env *env, int argc, char **argv) 24 24 { 25 char *name; 26 25 27 if (argc < 1) 26 28 usage(EXIT_FAILURE); 27 29 28 char *name = argv[0];30 name = argv[0]; 29 31 30 client_call("vx.reboot", "{s:s}", "name", name); 32 client_call("vx.reboot", 33 "{s:s}", 34 "name", name); 31 35 } trunk/src/vcc/vcc/remove.c
r548 r586 23 23 void cmd_remove(xmlrpc_env *env, int argc, char **argv) 24 24 { 25 char *name; 26 25 27 if (argc < 1) 26 28 usage(EXIT_FAILURE); 27 29 28 char *name = argv[0];30 name = argv[0]; 29 31 30 client_call("vx.remove", "{s:s}", "name", name); 32 client_call("vx.remove", 33 "{s:s}", 34 "name", name); 31 35 } trunk/src/vcc/vcc/rename.c
r548 r586 31 31 newname = argv[1]; 32 32 33 client_call("vx.rename", "{s:s,s:s}", "name", name, "newname", newname); 33 client_call("vx.rename", 34 "{s:s,s:s}", 35 "name", name, 36 "newname", newname); 34 37 } trunk/src/vcc/vcc/restart.c
r548 r586 17 17 18 18 #include <stdlib.h> 19 19 20 #include "vcc.h" 20 21 #include "cmd.h" … … 22 23 void cmd_restart(xmlrpc_env *env, int argc, char **argv) 23 24 { 25 char *name; 26 24 27 if (argc < 1) 25 28 usage(EXIT_FAILURE); 26 29 27 char *name = argv[0];30 name = argv[0]; 28 31 29 client_call("vx.restart", "{s:s}", "name", name); 32 client_call("vx.restart", 33 "{s:s}", 34 "name", name); 30 35 } trunk/src/vcc/vcc/start.c
r548 r586 23 23 void cmd_start(xmlrpc_env *env, int argc, char **argv) 24 24 { 25 char *name; 26 25 27 if (argc < 1) 26 28 usage(EXIT_FAILURE); 27 29 28 char *name = argv[0];30 name = argv[0]; 29 31 30 client_call("vx.start", "{s:s}", "name", name); 32 client_call("vx.start", 33 "{s:s}", 34 "name", name); 31 35 } trunk/src/vcc/vcc/status.c
r579 r586 50 50 { 51 51 xmlrpc_value *result; 52 int running, nproc, uptime; 52 char *name; 53 int running = 0, nproc = 0, uptime = 0; 53 54 char *loadavg1m, *loadavg5m, *loadavg15m; 54 55 … … 56 57 usage(EXIT_FAILURE); 57 58 58 char *name = argv[0];59 name = argv[0]; 59 60 60 result = client_call("vx.status", "{s:s}", "name", name); 61 result = client_call("vx.status", 62 "{s:s}", 63 "name", name); 61 64 return_if_fault(env); 62 65 trunk/src/vcc/vcc/stop.c
r548 r586 23 23 void cmd_stop(xmlrpc_env *env, int argc, char **argv) 24 24 { 25 char *name; 26 25 27 if (argc < 1) 26 28 usage(EXIT_FAILURE); 27 29 28 char *name = argv[0];30 name = argv[0]; 29 31 30 client_call("vx.stop", "{s:s}", "name", name); 32 client_call("vx.stop", 33 "{s:s}", 34 "name", name); 31 35 } trunk/src/vcc/vcc/templates.c
r548 r586 24 24 { 25 25 xmlrpc_value *response, *result; 26 char *name = "", *description;26 char *name, *description; 27 27 int len, i; 28 28 29 29 if (argc > 0) 30 30 name = argv[0]; 31 else 32 name = ""; 31 33 32 response = client_call("vx.templates", "{s:s}", "name", name); 34 response = client_call("vx.templates", 35 "{s:s}", 36 "name", name); 33 37 return_if_fault(env); 34 38 … … 40 44 return_if_fault(env); 41 45 42 xmlrpc_decompose_value(env, result, "{s:s,s:s,*}", 46 xmlrpc_decompose_value(env, result, 47 "{s:s,s:s,*}", 43 48 "name", &name, 44 49 "description", &description); trunk/src/vcc/vcdadm/status.c
r547 r586 48 48 { 49 49 xmlrpc_value *result; 50 int uptime , requests, nomethod, flogins;50 int uptime = 0, requests = 0, nomethod = 0, flogins = 0; 51 51 52 52 result = client_call0("vcd.status"); trunk/src/vcc/vcdadm/user.c
r585 r586 35 35 username = ""; 36 36 37 response = client_call("vcd.user.get", "{s:s}", 37 response = client_call("vcd.user.get", 38 "{s:s}", 38 39 "username", username); 39 40 return_if_fault(env); … … 70 71 username = argv[0]; 71 72 72 client_call("vcd.user.remove", "{s:s}", 73 client_call("vcd.user.remove", 74 "{s:s}", 73 75 "username", username); 74 76 } … … 77 79 { 78 80 char *username, *password; 79 int admin ;81 int admin = 0; 80 82 81 83 if (argc < 2) … … 83 85 84 86 username = argv[0]; 85 86 87 sscanf(argv[1], "%d", &admin); 87 88 … … 91 92 password = ""; 92 93 93 client_call("vcd.user.set", "{s:s,s:s,s:b}", 94 client_call("vcd.user.set", 95 "{s:s,s:s,s:b}", 94 96 "username", username, 95 97 "password", password, trunk/src/vcc/vcdadm/user_caps.c
r585 r586 33 33 cap = argv[1]; 34 34 35 client_call("vcd.user.caps.add", "{s:s,s:s}", 36 "username", username, 37 "cap", cap); 35 client_call("vcd.user.caps.add", 36 "{s:s,s:s}", 37 "username", username, 38 "cap", cap); 38 39 } 39 40 … … 49 50 username = argv[0]; 50 51 51 response = client_call("vcd.user.caps.get", "{s:s}", 52 "username", username); 52 response = client_call("vcd.user.caps.get", 53 "{s:s}", 54 "username", username); 53 55 return_if_fault(env); 54 56 … … 85 87 cap = ""; 86 88 87 client_call("vcd.user.caps.remove", "{s:s,s:s}", 89 client_call("vcd.user.caps.remove", 90 "{s:s,s:s}", 88 91 "username", username, 89 92 "cap", cap); trunk/src/vcc/vce/dx_limit.c
r550 r586 27 27 void cmd_dx_limit_get(xmlrpc_env *env, int argc, char **argv) 28 28 { 29 char *space, *inodes;30 int reserved;31 29 xmlrpc_value *response; 30 char *name, *space, *inodes; 31 int reserved = 0; 32 32 33 33 if (argc < 1) 34 34 usage(EXIT_FAILURE); 35 35 36 char *name = argv[0];36 name = argv[0]; 37 37 38 38 response = client_call("vxdb.dx.limit.get", … … 56 56 void cmd_dx_limit_remove(xmlrpc_env *env, int argc, char **argv) 57 57 { 58 char *name; 59 58 60 if (argc < 1) 59 61 usage(EXIT_FAILURE); 60 62 61 char *name = argv[0];63 name = argv[0]; 62 64 63 65 client_call("vxdb.dx.limit.remove", … … 69 71 { 70 72 char *name, *space, *inodes; 71 int reserved ;73 int reserved = 0; 72 74 73 75 if (argc < 4) trunk/src/vcc/vce/init.c
r550 r586 26 26 void cmd_init_get(xmlrpc_env *env, int argc, char **argv) 27 27 { 28 char *init, *halt, *reboot;29 int timeout;30 28 xmlrpc_value *response; 29 char *name, *init, *halt, *reboot; 30 int timeout = 0; 31 31 32 32 if (argc < 1) 33 33 usage(EXIT_FAILURE); 34 34 35 char *name = argv[0];35 name = argv[0]; 36 36 37 response = client_call("vxdb.init.get", "{s:s}", "name", name); 37 response = client_call("vxdb.init.get", 38 "{s:s}", 39 "name", name); 38 40 return_if_fault(env); 39 41 … … 56 58 void cmd_init_set(xmlrpc_env *env, int argc, char **argv) 57 59 { 58 char * init, *halt, *reboot;59 int timeout ;60 char *name, *init, *halt, *reboot; 61 int timeout = 0; 60 62 61 63 if (argc < 1) 62 64 usage(EXIT_FAILURE); 63 65 64 char *name = argv[0];66 name = argv[0]; 65 67 66 68 if (argc > 1) … … 81 83 if (argc > 4) 82 84 sscanf(argv[4], "%d", &timeout); 83 else84 timeout = 0;85 85 86 client_call("vxdb.init.set", "{s:s,s:s,s:s,s:s,s:i}", 86 client_call("vxdb.init.set", 87 "{s:s,s:s,s:s,s:s,s:i}", 87 88 "name", name, 88 89 "init", init, trunk/src/vcc/vce/list.c
r550 r586 24 24 { 25 25 xmlrpc_value *response, *result; 26 char *username = "";26 char *username; 27 27 int len, i; 28 28 29 29 if (argc > 0) 30 30 username = argv[0]; 31 else 32 username = ""; 31 33 32 34 response = client_call("vxdb.list", trunk/src/vcc/vce/mount.c
r550 r586 25 25 void cmd_mount_get(xmlrpc_env *env, int argc, char **argv) 26 26 { 27 char *src, *dst, *type, *opts;28 27 xmlrpc_value *response, *result; 28 char *name, *src, *dst, *type, *opts; 29 29 int len, i; 30 30 … … 32 32 usage(EXIT_FAILURE); 33 33 34 char *name = argv[0];34 name = argv[0]; 35 35 36 if (argc < 2) 36 if (argc > 1) 37 dst = argv[1]; 38 else 37 39 dst = ""; 38 else39 dst = argv[1];40 40 41 response = client_call("vxdb.mount.get", "{s:s,s:s}", 41 response = client_call("vxdb.mount.get", 42 "{s:s,s:s}", 42 43 "name", name, 43 44 "dst", dst); … … 69 70 void cmd_mount_remove(xmlrpc_env *env, int argc, char **argv) 70 71 { 71 char * dst;72 char *name, *dst; 72 73 73 74 if (argc < 1) 74 75 usage(EXIT_FAILURE); 75 76 76 char *name = argv[0];77 name = argv[0]; 77 78 78 if (argc < 2) 79 if (argc > 1) 80 dst = argv[1]; 81 else 79 82 dst = ""; 80 else81 dst = argv[1];82 83 83 client_call("vxdb.mount.remove", "{s:s,s:s}", 84 client_call("vxdb.mount.remove", 85 "{s:s,s:s}", 84 86 "name", name, 85 87 "dst", dst); … … 107 109 opts = ""; 108 110 109 client_call("vxdb.mount.set", "{s:s,s:s,s:s,s:s,s:s}", 111 client_call("vxdb.mount.set", 112 "{s:s,s:s,s:s,s:s,s:s}", 110 113 "name", name, 111 114 "src", src, trunk/src/vcc/vce/nx_addr.c
r550 r586 25 25 void cmd_nx_addr_get(xmlrpc_env *env, int argc, char **argv) 26 26 { 27 char *addr, *netmask;28 27 xmlrpc_value *response, *result; 28 char *name, *addr, *netmask; 29 29 int len, i; 30 30 … … 32 32 usage(EXIT_FAILURE); 33 33 34 char *name = argv[0];34 name = argv[0]; 35 35 36 if (argc < 2) 36 if (argc > 1) 37 addr = argv[1]; 38 else 37 39 addr = ""; 38 else39 addr = argv[1];40 40 41 response = client_call("vxdb.nx.addr.get", "{s:s,s:s}", 41 response = client_call("vxdb.nx.addr.get", 42 "{s:s,s:s}", 42 43 "name", name, 43 44 "addr", addr); … … 67 68 void cmd_nx_addr_remove(xmlrpc_env *env, int argc, char **argv) 68 69 { 69 char * addr;70 char *name, *addr; 70 71 71 72 if (argc < 1) 72 73 usage(EXIT_FAILURE); 73 74 74 char *name = argv[0];75 name = argv[0]; 75 76 76 if (argc < 2) 77 if (argc > 1) 78 addr = argv[1]; 79 else 77 80 addr = ""; 78 else79 addr = argv[1];80 81 81 client_call("vxdb.nx.addr.remove", "{s:s,s:s}", 82 client_call("vxdb.nx.addr.remove", 83 "{s:s,s:s}", 82 84 "name", name, 83 85 "addr", addr); … … 86 88 void cmd_nx_addr_set(xmlrpc_env *env, int argc, char **argv) 87 89 { 88 xmlrpc_value *response, *result; 89 char *name, *addr, *netmask = "255.255.255.255"; 90 char *name, *addr, *netmask; 90 91 91 92 if (argc < 2) … … 95 96 addr = argv[1]; 96 97 97 response = client_call("vxdb.nx.addr.get", "{s:s,s:s}",98 "name", name,99 "addr", addr);100 return_if_fault(env);98 if (argc > 2) 99 netmask = argv[2]; 100 else 101 netmask = ""; 101 102 102 if (xmlrpc_array_size(env, response) > 0) { 103 xmlrpc_array_read_item(env, response, 0, &result); 104 return_if_fault(env); 105 106 xmlrpc_decompose_value(env, result, 107 "{s:s,*}", 108 "netmask", &netmask); 109 return_if_fault(env); 110 111 xmlrpc_DECREF(result); 112 xmlrpc_DECREF(response); 113 } 114 115 if (argc > 1) 116 netmask = argv[1]; 117 118 client_call("vxdb.nx.addr.set", "{s:s,s:s,s:s}", 103 client_call("vxdb.nx.addr.set", 104 "{s:s,s:s,s:s}", 119 105 "name", name, 120 106 "addr", addr, trunk/src/vcc/vce/nx_broadcast.c
r550 r586 27 27 { 28 28 xmlrpc_value *response; 29 char * broadcast;29 char *name, *broadcast; 30 30 31 31 if (argc < 1) 32 32 usage(EXIT_FAILURE); 33 33 34 char *name = argv[0];34 name = argv[0]; 35 35 36 response = client_call("vxdb.nx.broadcast.get", "{s:s}", "name", name); 36 response = client_call("vxdb.nx.broadcast.get", 37 "{s:s}", 38 "name", name); 37 39 return_if_fault(env); 38 40 … … 46 48 void cmd_nx_broadcast_remove(xmlrpc_env *env, int argc, char **argv) 47 49 { 50 char *name; 51 48 52 if (argc < 1) 49 53 usage(EXIT_FAILURE); 50 54 51 char *name = argv[0];55 name = argv[0]; 52 56 53 client_call("vxdb.nx.broadcast.remove", "{s:s}", "name", name); 57 client_call("vxdb.nx.broadcast.remove", 58 "{s:s}", 59 "name", name); 54 60 } 55 61 … … 64 70 broadcast = argv[1]; 65 71 66 client_call("vxdb.nx.broadcast.set", "{s:s,s:s}", 72 client_call("vxdb.nx.broadcast.set", 73 "{s:s,s:s}", 67 74 "name", name, 68 75 "broadcast", broadcast); trunk/src/vcc/vce/vx_bcaps.c
r550 r586 33 33 bcap = argv[1]; 34 34 35 client_call("vxdb.vx.bcaps.add", "{s:s,s:s}", 35 client_call("vxdb.vx.bcaps.add", 36 "{s:s,s:s}", 36 37 "name", name, 37 38 "bcap", bcap); … … 40 41 void cmd_vx_bcaps_get(xmlrpc_env *env, int argc, char **argv) 41 42 { 42 char *bcap;43 43 xmlrpc_value *response, *result; 44 char *name, *bcap; 44 45 int len, i; 45 46 … … 47 48 usage(EXIT_FAILURE); 48 49 49 char *name = argv[0];50 name = argv[0]; 50 51 51 response = client_call("vxdb.vx.bcaps.get", "{s:s}", "name", name); 52 response = client_call("vxdb.vx.bcaps.get", 53 "{s:s}", 54 "name", name); 52 55 return_if_fault(env); 53 56 … … 72 75 void cmd_vx_bcaps_remove(xmlrpc_env *env, int argc, char **argv) 73 76 { 74 char * bcap;77 char *name, *bcap; 75 78 76 79 if (argc < 1) 77 80 usage(EXIT_FAILURE); 78 81 79 char *name = argv[0];82 name = argv[0]; 80 83 81 if (argc < 2) 84 if (argc > 1) 85 bcap = argv[1]; 86 else 82 87 bcap = ""; 83 else84 bcap = argv[1];85 88 86 client_call("vxdb.vx.bcaps.remove", "{s:s,s:s}", 89 client_call("vxdb.vx.bcaps.remove", 90 "{s:s,s:s}", 87 91 "name", name, 88 92 "bcap", bcap); trunk/src/vcc/vce/vx_ccaps.c
r550 r586 33 33 ccap = argv[1]; 34 34 35 client_call("vxdb.vx.ccaps.add", "{s:s,s:s}", 35 client_call("vxdb.vx.ccaps.add", 36 "{s:s,s:s}", 36 37 "name", name, 37 38 "ccap", ccap); … … 40 41 void cmd_vx_ccaps_get(xmlrpc_env *env, int argc, char **argv) 41 42 { 42 char *ccap;43 43 xmlrpc_value *response, *result; 44 char *name, *ccap; 44 45 int len, i; 45 46 … … 47 48 usage(EXIT_FAILURE); 48 49 49 char *name = argv[0];50 name = argv[0]; 50 51 51 response = client_call("vxdb.vx.ccaps.get", "{s:s}", "name", name); 52 response = client_call("vxdb.vx.ccaps.get", 53 "{s:s}", 54 "name", name); 52 55 return_if_fault(env); 53 56 … … 72 75 void cmd_vx_ccaps_remove(xmlrpc_env *env, int argc, char **argv) 73 76 { 74 char * ccap;77 char *name, *ccap; 75 78 76 79 if (argc < 1) 77 80 usage(EXIT_FAILURE); 78 81 79 char *name = argv[0];82 name = argv[0]; 80 83 81 if (argc < 2) 84 if (argc > 1) 85 ccap = argv[1]; 86 else 82 87 ccap = ""; 83 else84 ccap = argv[1];85 88 86 client_call("vxdb.vx.ccaps.remove", "{s:s,s:s}", 89 client_call("vxdb.vx.ccaps.remove", 90 "{s:s,s:s}", 87 91 "name", name, 88 92 "ccap", ccap); trunk/src/vcc/vce/vx_flags.c
r550 r586 33 33 flag = argv[1]; 34 34 35 client_call("vxdb.vx.flags.add", "{s:s,s:s}", 35 client_call("vxdb.vx.flags.add", 36 "{s:s,s:s}", 36 37 "name", name, 37 38 "flag", flag); … … 40 41 void cmd_vx_flags_get(xmlrpc_env *env, int argc, char **argv) 41 42 { 42 char *flag;43 43 xmlrpc_value *response, *result; 44 char *name, *flag; 44 45 int len, i; 45 46 … … 47 48 usage(EXIT_FAILURE); 48 49 49 char *name = argv[0];50 name = argv[0]; 50 51 51 response = client_call("vxdb.vx.flags.get", "{s:s}", "name", name); 52 response = client_call("vxdb.vx.flags.get", 53 "{s:s}", 54 "name", name); 52 55 return_if_fault(env); 53 56 … … 72 75 void cmd_vx_flags_remove(xmlrpc_env *env, int argc, char **argv) 73 76 { 74 char * flag;77 char *name, *flag; 75 78 76 79 if (argc < 1) 77 80 usage(EXIT_FAILURE); 78 81 79 char *name = argv[0];82 name = argv[0]; 80 83 81 if (argc < 2) 84 if (argc > 1) 85 flag = argv[1]; 86 else 82 87 flag = ""; 83 else84 flag = argv[1];85 88 86 client_call("vxdb.vx.flags.remove", "{s:s,s:s}", 89 client_call("vxdb.vx.flags.remove", 90 "{s:s,s:s}", 87 91 "name", name, 88 92 "flag", flag); trunk/src/vcc/vce/vx_limit.c
r571 r586 26 26 void cmd_vx_limit_get(xmlrpc_env *env, int argc, char **argv) 27 27 { 28 char *type, *soft, *max;29 28 xmlrpc_value *response, *result; 29 char *name, *type, *soft, *max; 30 30 int len, i; 31 31 … … 33 33 usage(EXIT_FAILURE); 34 34 35 char *name = argv[0];35 name = argv[0]; 36 36 37
