2006-12-27 Dmitry V. Levin <ldv@altlinux.org>

Add const qualifier to xlookup() return value

	* defs.h (xlookup): Add const qualifier to return value.
	* desc.c (sprintflags): Likewise.
	* process.c (printpriv): Update xlookup() use.
	* signal.c (sprintsigmask): Add const qualifier to first argument and return value.
	* util.c (xlookup): Add const qualifier to return value.
	(printxval): Update xlookup() use.
This commit is contained in:
Дмитрий Левин 2007-01-11 22:05:04 +00:00
parent 7d61ff1dbf
commit ab9008bc08
6 changed files with 26 additions and 28 deletions

View File

@ -1,3 +1,14 @@
2006-12-27 Dmitry V. Levin <ldv@altlinux.org>
Add const qualifier to xlookup() return value
* defs.h (xlookup): Add const qualifier to return value.
* desc.c (sprintflags): Likewise.
* process.c (printpriv): Update xlookup() use.
* signal.c (sprintsigmask): Add const qualifier to first argument and return value.
* util.c (xlookup): Add const qualifier to return value.
(printxval): Update xlookup() use.
2006-12-21 Dmitry V. Levin <ldv@altlinux.org>
Move counts code to separate file.

2
defs.h
View File

@ -424,7 +424,7 @@ extern struct tcb *tcp_last;
enum bitness_t { BITNESS_CURRENT = 0, BITNESS_32 };
extern int set_personality P((int personality));
extern char *xlookup P((const struct xlat *, int));
extern const char *xlookup P((const struct xlat *, int));
extern struct tcb *alloc_tcb P((int, int));
extern struct tcb *pid2tcb P((int));
extern void droptcb P((struct tcb *));

8
desc.c
View File

@ -242,13 +242,11 @@ int getlk;
}
#endif
static char *
sprintflags(xlat, flags)
const struct xlat *xlat;
int flags;
static const char *
sprintflags(const struct xlat *xlat, int flags)
{
static char outstr[1024];
char *sep;
const char *sep;
strcpy(outstr, "flags ");
sep = "";

View File

@ -1596,11 +1596,7 @@ static const struct xlat procpriv_type [] = {
static void
printpriv(tcp, addr, len, opt)
struct tcb *tcp;
long addr;
int len;
const struct xlat *opt;
printpriv(struct tcb *tcp, long addr, int len, const struct xlat *opt)
{
priv_t buf [128];
int max = verbose (tcp) ? sizeof buf / sizeof buf [0] : 10;
@ -1619,7 +1615,7 @@ const struct xlat *opt;
tprintf ("[");
for (i = 0; i < len; ++i) {
char *t, *p;
const char *t, *p;
if (i) tprintf (", ");

View File

@ -313,18 +313,16 @@ int len;
#define copy_sigset(tcp, addr, s) copy_sigset_len(tcp, addr, s, sizeof(sigset_t))
#endif
static char *
sprintsigmask(s, mask, rt)
char *s;
sigset_t *mask;
int rt; /* set might include realtime sigs */
static const char *
sprintsigmask(const char *str, sigset_t *mask, int rt)
/* set might include realtime sigs */
{
int i, nsigs;
int maxsigs;
char *format;
char *format, *s;
static char outstr[8 * sizeof(sigset_t) * 8];
strcpy(outstr, s);
strcpy(outstr, str);
s = outstr + strlen(outstr);
nsigs = 0;
maxsigs = nsignals;

13
util.c
View File

@ -231,10 +231,8 @@ int n;
tv->tv_usec %= 1000000;
}
char *
xlookup(xlat, val)
const struct xlat *xlat;
int val;
const char *
xlookup(const struct xlat *xlat, int val)
{
for (; xlat->str != NULL; xlat++)
if (xlat->val == val)
@ -246,12 +244,9 @@ int val;
* Print entry in struct xlat table, if there.
*/
void
printxval(xlat, val, dflt)
const struct xlat *xlat;
int val;
const char *dflt;
printxval(const struct xlat *xlat, int val, const char *dflt)
{
char *str = xlookup(xlat, val);
const char *str = xlookup(xlat, val);
if (str)
tprintf("%s", str);