empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(xdopt, xdver): Simplify the previous rev.

Browse source 
(xdump): Support selecting a dump by table number in addition to name.
This commit is contained in:
Markus Armbruster 2005-11-06 11:05:48 +00:00
parent 5173f8cd07
commit 610b1cded4
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/lib/commands/xdump.c
View file

@ -163,7 +163,10 @@ xdflds(struct castr ca[], void *ptr)
} }
} }
/* Dump first line of header for dump NAME. */ /*
* Dump header for dump NAME.
* If META, it's for the meta-data dump rather than the data dump.
*/
static void static void
xdhdr(char *name, int meta) xdhdr(char *name, int meta)
{ {
@ -244,7 +247,10 @@ xdmeta(int type)
return RET_OK; return RET_OK;
} }
/* Dump Options[], return RET_OK. */ /*
* Dump Options[], return RET_OK.
* If META, dump meta-data rather than data.
*/
static int static int
xdopt(int meta) xdopt(int meta)
{ {
@ -252,8 +258,9 @@ xdopt(int meta)
char *sep; char *sep;
struct castr ca; struct castr ca;
xdhdr("options", meta);
if (meta) { if (meta) {
xdhdr("options", 1);
for (i = 0; Options[i].opt_key; ++i) { for (i = 0; Options[i].opt_key; ++i) {
ca.ca_type = NSC_INT; ca.ca_type = NSC_INT;
ca.ca_flags = 0; ca.ca_flags = 0;
@ -268,8 +275,6 @@ xdopt(int meta)
return RET_OK; return RET_OK;
} }
xdhdr("options", 0);
sep = ""; sep = "";
for (i = 0; Options[i].opt_key; ++i) { for (i = 0; Options[i].opt_key; ++i) {
pr("%s%d", sep, *Options[i].opt_valuep); pr("%s%d", sep, *Options[i].opt_valuep);
@ -282,6 +287,10 @@ xdopt(int meta)
return RET_OK; return RET_OK;
} }
/*
* Dump configkeys[], return RET_OK.
* If META, dump meta-data rather than data.
*/
static int static int
xdver(int meta) xdver(int meta)
{ {
@ -291,8 +300,9 @@ xdver(int meta)
struct castr ca; struct castr ca;
struct valstr val; struct valstr val;
xdhdr("version", meta);
if (meta) { if (meta) {
xdhdr("version", 1);
n = 0; n = 0;
for (kp = configkeys; kp->km_key; ++kp) { for (kp = configkeys; kp->km_key; ++kp) {
if (kp->km_type != NSC_NOTYPE && !(kp->km_flags & KM_INTERNAL)) { if (kp->km_type != NSC_NOTYPE && !(kp->km_flags & KM_INTERNAL)) {
@ -311,8 +321,6 @@ xdver(int meta)
return RET_OK; return RET_OK;
} }
xdhdr("version", 0);
sep = ""; sep = "";
for (kp = configkeys; kp->km_key; ++kp) { for (kp = configkeys; kp->km_key; ++kp) {
if (kp->km_type != NSC_NOTYPE && !(kp->km_flags & KM_INTERNAL)) { if (kp->km_type != NSC_NOTYPE && !(kp->km_flags & KM_INTERNAL)) {
@ -349,7 +357,7 @@ xdump(void)
if (!p) if (!p)
return RET_SYN; return RET_SYN;
type = ef_byname(p); type = isdigit(p[0]) ? atoi(p) : ef_byname(p);
if (type >= 0) { if (type >= 0) {
if (meta) if (meta)
return xdmeta(type); return xdmeta(type);