The following commit has been merged in the master branch:
commit 0ff1ba98ce2dd4d8268e4154b7173fab49657045
Author: Guillem Jover <[email protected]>
Date: Fri Feb 11 05:21:36 2011 +0100
libdpkg: Rename cmdinfo arg members
The current names are not descriptive enough, so rename parg to arg_ptr,
farg to arg_func, and finally arg to arg_int (which disambiguates what
kind of data it's holding).
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 126b92c..a18e79d 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -195,7 +195,7 @@ int main(int argc, const char *const *argv) {
if (!cipaction) badusage(_("need an action option"));
unsetenv("GZIP");
- action = (dofunction *)cipaction->farg;
+ action = (dofunction *)cipaction->arg_func;
action(argv);
standard_shutdown();
exit(0);
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index c56367e..70473d9 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -170,7 +170,7 @@ int main(int argc, const char *const *argv) {
}
setvbuf(stdout,NULL,_IONBF,0);
- action = (dofunction *)cipaction->farg;
+ action = (dofunction *)cipaction->arg_func;
action(argv);
m_output(stderr, _("<standard error>"));
diff --git a/lib/dpkg/myopt.c b/lib/dpkg/myopt.c
index 4d7fd64..ea8a310 100644
--- a/lib/dpkg/myopt.c
+++ b/lib/dpkg/myopt.c
@@ -124,7 +124,8 @@ void myfileopt(const char* fn, const struct cmdinfo*
cmdinfos) {
if (opt)
config_error(fn, line_num, _("'%s' does not take a value"), linebuf);
if (cip->call) cip->call(cip,NULL);
- else *cip->iassignto= cip->arg;
+ else
+ *cip->iassignto = cip->arg_int;
}
}
if (ferror(file)) ohshite(_("read error in configuration file `%.255s'"),
fn);
@@ -228,7 +229,8 @@ void myopt(const char *const **argvp, const struct cmdinfo
*cmdinfos) {
} else {
if (value) badusage(_("--%s option does not take a value"),cip->olong);
if (cip->call) cip->call(cip,NULL);
- else *cip->iassignto= cip->arg;
+ else
+ *cip->iassignto = cip->arg_int;
}
} else {
while (*p) {
@@ -248,7 +250,8 @@ void myopt(const char *const **argvp, const struct cmdinfo
*cmdinfos) {
} else {
if (*p == '=') badusage(_("-%c option does not take a
value"),cip->oshort);
if (cip->call) cip->call(cip,NULL);
- else *cip->iassignto= cip->arg;
+ else
+ *cip->iassignto = cip->arg_int;
}
}
}
diff --git a/lib/dpkg/myopt.h b/lib/dpkg/myopt.h
index 1c36b5e..1cf557d 100644
--- a/lib/dpkg/myopt.h
+++ b/lib/dpkg/myopt.h
@@ -41,9 +41,10 @@ struct cmdinfo {
int *iassignto;
const char **sassignto;
void (*call)(const struct cmdinfo*, const char *value);
- int arg;
- void *parg;
- void_func *farg;
+
+ int arg_int;
+ void *arg_ptr;
+ void_func *arg_func;
};
extern const char printforhelp[];
diff --git a/src/archives.c b/src/archives.c
index 59f5c51..367235b 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -1189,7 +1189,7 @@ void archivefiles(const char *const *argv) {
modstatdb_init(admindir,
f_noact ? msdbrw_readonly
- : cipaction->arg == act_avail ? msdbrw_write
+ : cipaction->arg_int == act_avail ? msdbrw_write
: fc_nonroot ? msdbrw_write
: msdbrw_needsuperuser);
@@ -1298,7 +1298,7 @@ void archivefiles(const char *const *argv) {
pop_error_context(ehflag_normaltidy);
}
- switch (cipaction->arg) {
+ switch (cipaction->arg_int) {
case act_install:
case act_configure:
case act_triggers:
@@ -1309,7 +1309,7 @@ void archivefiles(const char *const *argv) {
case act_avail:
break;
default:
- internerr("unknown action '%d'", cipaction->arg);
+ internerr("unknown action '%d'", cipaction->arg_int);
}
trigproc_run_deferred();
diff --git a/src/cleanup.c b/src/cleanup.c
index 0013c5a..1adb551 100644
--- a/src/cleanup.c
+++ b/src/cleanup.c
@@ -131,7 +131,7 @@ void cu_prermupgrade(int argc, void **argv) {
void ok_prermdeconfigure(int argc, void **argv) {
struct pkginfo *deconf= (struct pkginfo*)argv[0];
- if (cipaction->arg == act_install)
+ if (cipaction->arg_int == act_install)
add_to_queue(deconf);
}
diff --git a/src/divertcmd.c b/src/divertcmd.c
index 9d52ddb..706f785 100644
--- a/src/divertcmd.c
+++ b/src/divertcmd.c
@@ -722,7 +722,7 @@ main(int argc, const char * const *argv)
if (!cipaction)
setaction(&cmdinfo_add, NULL);
- actionfunction = (int (*)(const char *const *))cipaction->farg;
+ actionfunction = (int (*)(const char *const *))cipaction->arg_func;
setvbuf(stdout, NULL, _IONBF, 0);
diff --git a/src/main.c b/src/main.c
index d1712ba..8c82692 100644
--- a/src/main.c
+++ b/src/main.c
@@ -322,7 +322,7 @@ static void setdebug(const struct cmdinfo *cpi, const char
*value) {
static void
setfilter(const struct cmdinfo *cip, const char *value)
{
- filter_add(value, cip->arg);
+ filter_add(value, cip->arg_int);
}
static void setroot(const struct cmdinfo *cip, const char *value) {
@@ -407,7 +407,7 @@ struct invoke_hook **status_loggers_tail = &status_loggers;
static void
set_invoke_hook(const struct cmdinfo *cip, const char *value)
{
- struct invoke_hook ***hook_tail = cip->parg;
+ struct invoke_hook ***hook_tail = cip->arg_ptr;
struct invoke_hook *hook_new;
hook_new = nfmalloc(sizeof(struct invoke_hook));
@@ -503,9 +503,9 @@ static void setforce(const struct cmdinfo *cip, const char
*value) {
} else if (strcmp(fip->name, "all") == 0) {
for (fip = forceinfos; fip->name; fip++)
if (fip->opt)
- *fip->opt = cip->arg;
+ *fip->opt = cip->arg_int;
} else if (fip->opt) {
- *fip->opt = cip->arg;
+ *fip->opt = cip->arg_int;
} else {
warning(_("obsolete force/refuse option '%s'\n"), fip->name);
}
@@ -608,8 +608,8 @@ void execbackend(const char *const *argv) {
struct command cmd;
char *arg;
- command_init(&cmd, cipaction->parg, NULL);
- command_add_arg(&cmd, cipaction->parg);
+ command_init(&cmd, cipaction->arg_ptr, NULL);
+ command_add_arg(&cmd, cipaction->arg_ptr);
m_asprintf(&arg, "--%s", cipaction->olong);
command_add_arg(&cmd, arg);
@@ -713,7 +713,7 @@ void commandfd(const char *const *argv) {
myopt((const char *const**)&newargs,cmdinfos);
if (!cipaction) badusage(_("need an action option"));
- actionfunction= (void (*)(const char* const*))cipaction->farg;
+ actionfunction = (void (*)(const char *const *))cipaction->arg_func;
actionfunction(newargs);
pop_error_context(ehflag_normaltidy);
@@ -738,22 +738,22 @@ int main(int argc, const char *const *argv) {
ohshite(_("unable to setenv for subprocesses"));
if (!f_triggers)
- f_triggers = (cipaction->arg == act_triggers && *argv) ? -1 : 1;
+ f_triggers = (cipaction->arg_int == act_triggers && *argv) ? -1 : 1;
setvbuf(stdout, NULL, _IONBF, 0);
- if (is_invoke_action(cipaction->arg)) {
+ if (is_invoke_action(cipaction->arg_int)) {
run_invoke_hooks(cipaction->olong, pre_invoke_hooks);
run_status_loggers(status_loggers);
}
filesdbinit();
- actionfunction= (void (*)(const char* const*))cipaction->farg;
+ actionfunction = (void (*)(const char *const *))cipaction->arg_func;
actionfunction(argv);
- if (is_invoke_action(cipaction->arg))
+ if (is_invoke_action(cipaction->arg_int))
run_invoke_hooks(cipaction->olong, post_invoke_hooks);
standard_shutdown();
diff --git a/src/packages.c b/src/packages.c
index f0b2db4..8f0243c 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -62,7 +62,7 @@ enqueue_pending(void)
it = pkg_db_iter_new();
while ((pkg = pkg_db_iter_next(it)) != NULL) {
- switch (cipaction->arg) {
+ switch (cipaction->arg_int) {
case act_configure:
if (!(pkg->status == stat_unpacked ||
pkg->status == stat_halfconfigured ||
@@ -89,7 +89,7 @@ enqueue_pending(void)
continue;
break;
default:
- internerr("unknown action '%d'", cipaction->arg);
+ internerr("unknown action '%d'", cipaction->arg_int);
}
add_to_queue(pkg);
}
@@ -161,18 +161,18 @@ void process_queue(void) {
clear_istobes();
- switch (cipaction->arg) {
+ switch (cipaction->arg_int) {
case act_triggers:
case act_configure: case act_install: istobe= itb_installnew; break;
case act_remove: case act_purge: istobe= itb_remove; break;
default:
- internerr("unknown action '%d'", cipaction->arg);
+ internerr("unknown action '%d'", cipaction->arg_int);
}
for (rundown = queue.head; rundown; rundown = rundown->next) {
ensure_package_clientdata(rundown->pkg);
if (rundown->pkg->clientdata->istobe == istobe) {
/* Erase the queue entry - this is a second copy! */
- switch (cipaction->arg) {
+ switch (cipaction->arg_int) {
case act_triggers:
case act_configure: case act_remove: case act_purge:
printf(_("Package %s listed more than once, only processing once.\n"),
@@ -184,7 +184,7 @@ void process_queue(void) {
rundown->pkg->name);
break;
default:
- internerr("unknown action '%d'", cipaction->arg);
+ internerr("unknown action '%d'", cipaction->arg_int);
}
rundown->pkg = NULL;
} else {
@@ -197,7 +197,7 @@ void process_queue(void) {
if (!pkg)
continue; /* Duplicate, which we removed earlier. */
- action_todo = cipaction->arg;
+ action_todo = cipaction->arg_int;
if (sincenothing++ > queue.length * 2 + 2) {
if (progress_bytrigproc && progress_bytrigproc->trigpend_head) {
@@ -248,7 +248,7 @@ void process_queue(void) {
deferred_remove(pkg);
break;
default:
- internerr("unknown action '%d'", cipaction->arg);
+ internerr("unknown action '%d'", cipaction->arg_int);
}
m_output(stdout, _("<standard output>"));
m_output(stderr, _("<standard error>"));
diff --git a/src/processarc.c b/src/processarc.c
index 0c2d49a..a8c9323 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -294,7 +294,7 @@ void process_archive(const char *filename) {
sprintf(psize, "%lu", (unsigned long)stab.st_size);
pkg->files->size = psize;
- if (cipaction->arg == act_avail) {
+ if (cipaction->arg_int == act_avail) {
printf(_("Recorded info about %s from %s.\n"),pkg->name,pfilename);
pop_cleanup(ehflag_normaltidy);
return;
@@ -1288,5 +1288,6 @@ void process_archive(const char *filename) {
removal_bulk(conflictor[i]);
}
- if (cipaction->arg == act_install) add_to_queue(pkg);
+ if (cipaction->arg_int == act_install)
+ add_to_queue(pkg);
}
diff --git a/src/querycmd.c b/src/querycmd.c
index f88cec1..07aa84d 100644
--- a/src/querycmd.c
+++ b/src/querycmd.c
@@ -367,7 +367,7 @@ enqperpackage(const char *const *argv)
if (!*argv)
badusage(_("--%s needs at least one package name argument"),
cipaction->olong);
- if (cipaction->arg==act_listfiles)
+ if (cipaction->arg_int == act_listfiles)
modstatdb_init(admindir,msdbrw_readonly|msdbrw_noavail);
else
modstatdb_init(admindir,msdbrw_readonly);
@@ -375,7 +375,7 @@ enqperpackage(const char *const *argv)
while ((thisarg = *argv++) != NULL) {
pkg = pkg_db_find(thisarg);
- switch (cipaction->arg) {
+ switch (cipaction->arg_int) {
case act_status:
if (pkg->status == stat_notinstalled &&
pkg->priority == pri_unknown &&
@@ -432,7 +432,7 @@ enqperpackage(const char *const *argv)
}
break;
default:
- internerr("unknown action '%d'", cipaction->arg);
+ internerr("unknown action '%d'", cipaction->arg_int);
}
if (*argv != NULL)
@@ -734,7 +734,7 @@ int main(int argc, const char *const *argv) {
setvbuf(stdout, NULL, _IONBF, 0);
filesdbinit();
- actionfunction = (int (*)(const char *const *))cipaction->farg;
+ actionfunction = (int (*)(const char *const *))cipaction->arg_func;
ret = actionfunction(argv);
diff --git a/src/remove.c b/src/remove.c
index a9044e7..e79eba8 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -90,7 +90,7 @@ void deferred_remove(struct pkginfo *pkg) {
return;
} else if (!f_pending &&
pkg->status == stat_configfiles &&
- cipaction->arg != act_purge) {
+ cipaction->arg_int != act_purge) {
warning(_("ignoring request to remove %.250s, only the config\n"
" files of which are on the system. Use --purge to remove them
too."),
pkg->name);
@@ -103,7 +103,7 @@ void deferred_remove(struct pkginfo *pkg) {
" it should not be removed."));
if (!f_pending)
- pkg->want= (cipaction->arg == act_purge) ? want_purge : want_deinstall;
+ pkg->want = (cipaction->arg_int == act_purge) ? want_purge :
want_deinstall;
if (!f_noact) modstatdb_note(pkg);
debug(dbg_general,"checking dependencies for remove `%s'",pkg->name);
diff --git a/src/statcmd.c b/src/statcmd.c
index d3a14df..377acbd 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -382,7 +382,7 @@ main(int argc, const char *const *argv)
filesdbinit();
ensure_statoverrides();
- actionfunction = (int (*)(const char *const *))cipaction->farg;
+ actionfunction = (int (*)(const char *const *))cipaction->arg_func;
ret = actionfunction(argv);
standard_shutdown();
diff --git a/src/update.c b/src/update.c
index 22b192a..08b1f9f 100644
--- a/src/update.c
+++ b/src/update.c
@@ -39,7 +39,7 @@ void updateavailable(const char *const *argv) {
int count= 0;
static struct varbuf vb;
- switch (cipaction->arg) {
+ switch (cipaction->arg_int) {
case act_avclear:
if (sourcefile) badusage(_("--%s takes no arguments"),cipaction->olong);
break;
@@ -48,7 +48,7 @@ void updateavailable(const char *const *argv) {
badusage(_("--%s needs exactly one Packages file
argument"),cipaction->olong);
break;
default:
- internerr("unknown action '%d'", cipaction->arg);
+ internerr("unknown action '%d'", cipaction->arg_int);
}
if (!f_noact) {
@@ -61,7 +61,7 @@ void updateavailable(const char *const *argv) {
modstatdb_lock(admindir);
}
- switch (cipaction->arg) {
+ switch (cipaction->arg_int) {
case act_avreplace:
printf(_("Replacing available packages info, using %s.\n"),sourcefile);
break;
@@ -71,18 +71,18 @@ void updateavailable(const char *const *argv) {
case act_avclear:
break;
default:
- internerr("unknown action '%d'", cipaction->arg);
+ internerr("unknown action '%d'", cipaction->arg_int);
}
varbuf_add_str(&vb, admindir);
varbuf_add_str(&vb, "/" AVAILFILE);
varbuf_add_char(&vb, '\0');
- if (cipaction->arg == act_avmerge)
+ if (cipaction->arg_int == act_avmerge)
parsedb(vb.buf, pdb_recordavailable | pdb_rejectstatus | pdb_lax_parser,
NULL);
- if (cipaction->arg != act_avclear)
+ if (cipaction->arg_int != act_avclear)
count += parsedb(sourcefile,
pdb_recordavailable | pdb_rejectstatus | pdb_ignoreolder,
NULL);
@@ -92,7 +92,7 @@ void updateavailable(const char *const *argv) {
modstatdb_unlock();
}
- if (cipaction->arg != act_avclear)
+ if (cipaction->arg_int != act_avclear)
printf(P_("Information about %d package was updated.\n",
"Information about %d packages was updated.\n", count), count);
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
