projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Files are generated with each run, no reason to save them.
[m6w6/libmemcached]
/
src
/
utilities.c
diff --git
a/src/utilities.c
b/src/utilities.c
index ce6cd925bdc76d566ca15d4a5243d71102e32a47..ed0dbb308d917d119a5b60c76fbb58eea6457867 100644
(file)
--- a/
src/utilities.c
+++ b/
src/utilities.c
@@
-1,38
+1,39
@@
-#include <memcached.h>
+#include <ctype.h>
+#include <strings.h>
+#include "utilities.h"
-static char **cleanup_list= NULL;
-static char cleanup_list_length= 0;
-
-void parse_opt_servers(memcached_st *memc,
- char *server_strings)
+memcached_server_st *parse_opt_servers(char *server_strings)
{
char *string;
unsigned int port;
char *begin_ptr;
char *end_ptr;
{
char *string;
unsigned int port;
char *begin_ptr;
char *end_ptr;
-
-
end_ptr= server_strings + strlen(server_strings)
;
+ memcached_server_st *servers= NULL;
+
memcached_return rc
;
assert(server_strings);
assert(server_strings);
- assert(memc);
+
+ end_ptr= server_strings + strlen(server_strings);
for (begin_ptr= server_strings, string= index(server_strings, ',');
for (begin_ptr= server_strings, string= index(server_strings, ',');
- begin_ptr
=
= end_ptr;
-
begin_ptr= ++string,
string= index(begin_ptr, ','))
+ begin_ptr
!
= end_ptr;
+ string= index(begin_ptr, ','))
{
char buffer[HUGE_STRING_LEN];
char *ptr;
{
char buffer[HUGE_STRING_LEN];
char *ptr;
+ port= 0;
memset(buffer, 0, HUGE_STRING_LEN);
if (string)
{
memcpy(buffer, begin_ptr, string - begin_ptr);
memset(buffer, 0, HUGE_STRING_LEN);
if (string)
{
memcpy(buffer, begin_ptr, string - begin_ptr);
+ begin_ptr= string+1;
}
else
{
}
else
{
- size_t length= strlen(
server_strings
);
+ size_t length= strlen(
begin_ptr
);
memcpy(buffer, begin_ptr, length);
memcpy(buffer, begin_ptr, length);
-
string= server_strings+length
;
+
begin_ptr= end_ptr
;
}
ptr= index(buffer, ':');
}
ptr= index(buffer, ':');
@@
-44,34
+45,48
@@
void parse_opt_servers(memcached_st *memc,
ptr++;
port= strtol(ptr, (char **)NULL, 10);
ptr++;
port= strtol(ptr, (char **)NULL, 10);
-
- memcached_server_add(memc, buffer, port);
- }
- else
- {
- memcached_server_add(memc, buffer, 0);
}
}
+
+ servers= memcached_server_list_append(servers, buffer, port, &rc);
+
+ if (isspace(*begin_ptr))
+ begin_ptr++;
}
}
+
+ return servers;
}
}
-
void cleanup(void
)
+
long int timedif(struct timeval a, struct timeval b
)
{
{
- unsigned int x;
- for (x= 0; x < cleanup_list_length; x++)
- free(cleanup_list[x]);
+ register int us, s;
- free(cleanup_list);
+ us = a.tv_usec - b.tv_usec;
+ us /= 1000;
+ s = a.tv_sec - b.tv_sec;
+ s *= 1000;
+ return s + us;
}
}
-
char *strdup_cleanup(const char *str
)
+
void version_command(char *command_name
)
{
{
- char *ptr;
+ printf("%s v%u.%u\n", command_name, 1, 0);
+ exit(0);
+}
+
+void help_command(char *command_name, char *description,
+ const struct option *long_options,
+ memcached_programs_help_st *options)
+{
+ unsigned int x;
- ptr= strdup(str);
+ printf("%s v%u.%u\n\n", command_name, 1, 0);
+ printf("\t%s\n\n", description);
+ printf("Current options. A '=' means the option takes a value.\n\n");
- cleanup_list= (char **)realloc(cleanup_list, sizeof(char *) * (cleanup_list_length+1));
- cleanup_list[cleanup_list_length]= ptr;
- cleanup_list_length++;
+ for (x= 0; long_options[x].name; x++)
+ printf("\t --%s%c\n", long_options[x].name,
+ long_options[x].has_arg ? '=' : ' ');
- return ptr;
+ printf("\n");
+ exit(0);
}
}