JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove all but these __CRAZY=Yes build warnings:

Browse Source 
main.c: In function 'main':
 main.c:208: warning: cast discards qualifiers from pointer target type
 main.c:329: warning: cast discards qualifiers from pointer target type

no warnings at autoconf time left either; will take care of these two later
(might revisit changes from this commit), maybe change declararion for the
builtins to have their argv[] be const strings, and go through strict type
and qualifier checking again. this'll further improve stability.

XXX these changes might have introduced (more?) memory leaks,
XXX someone who knows about these tools should verify with
XXX automatic memory usage analysers (valgrind?)

still passes testsuite
This commit is contained in:
tg
2006-11-12 14:58:16 +00:00
parent fa7407a37c
commit 151d913115
9 changed files with 80 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
misc.c
View File

@ -6,7 +6,7 @@
#include <grp.h>
#endif
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.41 2006/11/12 13:35:29 tg Exp $\t"
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.42 2006/11/12 14:58:15 tg Exp $\t"
MKSH_SH_H_ID);
#undef USE_CHVT
@ -160,14 +160,14 @@ struct options_info {
int opts[NELEM(options)];
};
static char *options_fmt_entry(void *arg, int i, char *buf, int buflen);
static void printoptions(int verbose);
static char *options_fmt_entry(const void *arg, int, char *, int);
static void printoptions(int);
/* format a single select menu item */
static char *
options_fmt_entry(void *arg, int i, char *buf, int buflen)
options_fmt_entry(const void *arg, int i, char *buf, int buflen)
{
struct options_info *oi = (struct options_info *) arg;
const struct options_info *oi = (const struct options_info *)arg;
shf_snprintf(buf, buflen, "%-*s %s",
oi->opt_width, options[oi->opts[i]].name,
@ -764,7 +764,7 @@ pat_scan(const unsigned char *p, const unsigned char *pe, int match_sep)
int
xstrcmp(const void *p1, const void *p2)
{
return (strcmp(*(const char **)p1, *(const char **)p2));
return (strcmp(*(char * const *)p1, *(char * const *)p2));
}
/* Initialise a Getopt structure */
@ -936,8 +936,9 @@ print_value_quoted(const char *s)
* element
*/
void
print_columns(struct shf *shf, int n, char *(*func) (void *, int, char *, int),
void *arg, int max_width, int prefcol)
print_columns(struct shf *shf, int n,
char *(*func) (const void *, int, char *, int),
const void *arg, int max_width, int prefcol)
{
char *str = (char *) alloc(max_width + 1, ATEMP);
int i;