projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixed all warnings in code.
[awesomized/libmemcached]
/
src
/
memcat.c
diff --git
a/src/memcat.c
b/src/memcat.c
index 4253aa00fc2663e0a4ab6804f9eb7f9d100f93c7..1e7f5bf7821131aa1c63c371dc46c6caa53d7332 100644
(file)
--- a/
src/memcat.c
+++ b/
src/memcat.c
@@
-10,8
+10,8
@@
/* Prototypes */
\r
void options_parse(int argc, char *argv[]);
\r
\r
/* Prototypes */
\r
void options_parse(int argc, char *argv[]);
\r
\r
-static int opt_verbose;
\r
-static int opt_displayflag;
\r
+static int opt_verbose
= 0
;
\r
+static int opt_displayflag
= 0
;
\r
static char *opt_servers;
\r
\r
int main(int argc, char *argv[])
\r
static char *opt_servers;
\r
\r
int main(int argc, char *argv[])
\r
@@
-19,7
+19,7
@@
int main(int argc, char *argv[])
memcached_st *memc;
\r
char *string;
\r
size_t string_length;
\r
memcached_st *memc;
\r
char *string;
\r
size_t string_length;
\r
- uint16_t
flags;
\r
+ uint16_t flags;
\r
memcached_return rc;
\r
\r
memc= memcached_init(NULL);
\r
memcached_return rc;
\r
\r
memc= memcached_init(NULL);
\r
@@
-37,39
+37,41
@@
int main(int argc, char *argv[])
{
\r
if (opt_displayflag)
\r
{
\r
{
\r
if (opt_displayflag)
\r
{
\r
- if (opt_verbose)
\r
- printf("key: %s\nflags: ", argv[optind]);
\r
-
printf("%u
\n", flags);
\r
+
if (opt_verbose)
\r
+
printf("key: %s\nflags: ", argv[optind]);
\r
+
printf("%x
\n", flags);
\r
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
- if (opt_verbose)
\r
-
printf("key: %s\nflags: %u\nlength: %uz
\nvalue: ",
\r
- argv[optind], flags, string_length);
\r
- printf("%.*s\n", string_length, string);
\r
+
if (opt_verbose)
\r
+
printf("key: %s\nflags: %x\nlength: %zu
\nvalue: ",
\r
+
argv[optind], flags, string_length);
\r
+ printf("%.*s\n",
(int)
string_length, string);
\r
free(string);
\r
}
\r
}
\r
else
\r
{
\r
fprintf(stderr, "memcat: %s: memcache error %s\n",
\r
free(string);
\r
}
\r
}
\r
else
\r
{
\r
fprintf(stderr, "memcat: %s: memcache error %s\n",
\r
- argv[optind], memcached_strerror(memc, rc));
\r
+
argv[optind], memcached_strerror(memc, rc));
\r
}
\r
optind++;
\r
}
\r
\r
memcached_deinit(memc);
\r
\r
}
\r
optind++;
\r
}
\r
\r
memcached_deinit(memc);
\r
\r
+ free(opt_servers);
\r
+
\r
return 0;
\r
};
\r
\r
\r
void options_parse(int argc, char *argv[])
\r
{
\r
return 0;
\r
};
\r
\r
\r
void options_parse(int argc, char *argv[])
\r
{
\r
- int option_index
= 0;
\r
+ int option_index= 0;
\r
int option_rv;
\r
\r
int option_rv;
\r
\r
- static struct option long_options[]
=
\r
+ static struct option long_options[]=
\r
{
\r
{"version", no_argument, NULL, OPT_VERSION},
\r
{"help", no_argument, NULL, OPT_HELP},
\r
{
\r
{"version", no_argument, NULL, OPT_VERSION},
\r
{"help", no_argument, NULL, OPT_HELP},
\r
@@
-82,9
+84,10
@@
void options_parse(int argc, char *argv[])
\r
while (1)
\r
{
\r
\r
while (1)
\r
{
\r
- option_rv
= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
\r
+ option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
\r
if (option_rv == -1) break;
\r
if (option_rv == -1) break;
\r
- switch (option_rv) {
\r
+ switch (option_rv)
\r
+ {
\r
case 0:
\r
break;
\r
case OPT_VERSION: /* --version or -V */
\r
case 0:
\r
break;
\r
case OPT_VERSION: /* --version or -V */
\r
@@
-96,7
+99,7
@@
void options_parse(int argc, char *argv[])
exit(0);
\r
break;
\r
case OPT_SERVERS: /* --servers or -s */
\r
exit(0);
\r
break;
\r
case OPT_SERVERS: /* --servers or -s */
\r
- opt_servers=
optarg
;
\r
+ opt_servers=
strdup(optarg)
;
\r
break;
\r
case '?':
\r
/* getopt_long already printed an error message. */
\r
break;
\r
case '?':
\r
/* getopt_long already printed an error message. */
\r