projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in bug fix for 456080.
[m6w6/libmemcached]
/
clients
/
utilities.h
diff --git
a/clients/utilities.h
b/clients/utilities.h
index af6706135b84a19232b4162ee1e542d0d0188f3f..a998773b97f9342e2a3ba2f4dfc757b3082fc0be 100644
(file)
--- a/
clients/utilities.h
+++ b/
clients/utilities.h
@@
-1,5
+1,17
@@
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license. See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary:
+ *
+ */
+
#include <getopt.h>
#include <libmemcached/memcached.h>
#include <getopt.h>
#include <libmemcached/memcached.h>
+#include "libmemcached/watchpoint.h"
#include "client_options.h"
#if TIME_WITH_SYS_TIME
#include "client_options.h"
#if TIME_WITH_SYS_TIME
@@
-13,9
+25,18
@@
# endif
#endif
# endif
#endif
+#ifdef __sun
+ /* For some odd reason the option struct on solaris defines the argument
+ * as char* and not const char*
+ */
+#define OPTIONSTRING char*
+#else
+#define OPTIONSTRING const char*
+#endif
+
typedef struct memcached_programs_help_st memcached_programs_help_st;
typedef struct memcached_programs_help_st memcached_programs_help_st;
-struct memcached_programs_help_st
+struct memcached_programs_help_st
{
char *not_used_yet;
};
{
char *not_used_yet;
};
@@
-28,3
+49,6
@@
void help_command(const char *command_name, const char *description,
const struct option *long_options,
memcached_programs_help_st *options);
void process_hash_option(memcached_st *memc, char *opt_hash);
const struct option *long_options,
memcached_programs_help_st *options);
void process_hash_option(memcached_st *memc, char *opt_hash);
+bool initialize_sasl(memcached_st *memc, char *user, char *password);
+void shutdown_sasl(void);
+void initialize_sockets(void);