*
*/
-#include "common.h"
+#include "libmemcached/common.h"
-#include <libmemcached/options/parser.h>
-#include <libmemcached/options/scanner.h>
+#include <iostream>
-int libmemcached_parse(type_st *, yyscan_t *);
+#include <libmemcached/options/context.h>
const char *memcached_parse_filename(memcached_st *memc)
{
static memcached_return_t _parse_file_options(memcached_st *self, memcached_string_t *filename)
{
- FILE *fp= fopen(filename->c_str, "r");
+ memcached_array_st *real_name= memcached_strcpy(self, filename->c_str, filename->size);
+
+ if (not real_name)
+ return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+
+ FILE *fp= fopen(memcached_array_string(real_name), "r");
if (! fp)
- return memcached_set_errno(self, errno, NULL);
+ {
+ memcached_string_t error_message= memcached_array_to_string(real_name);
+ memcached_return_t rc= memcached_set_errno(self, errno, &error_message);
+ memcached_array_free(real_name);
+ return rc;
+ }
+ memcached_array_free(real_name);
char buffer[BUFSIZ];
memcached_return_t rc= MEMCACHED_INVALID_ARGUMENTS;
return rc;
}
-memcached_return_t libmemcached_check_configuration(const char *option_string, size_t length, const char *error_buffer, size_t error_buffer_size)
+memcached_return_t libmemcached_check_configuration(const char *option_string, size_t length, char *error_buffer, size_t error_buffer_size)
{
memcached_st memc, *memc_ptr;
memcached_return_t rc= memcached_parse_configuration(memc_ptr, option_string, length);
if (rc != MEMCACHED_SUCCESS && error_buffer && error_buffer_size)
{
- strncpy(error_buffer, error_buffer_size, memcached_last_error_message(memc_ptr));
+ strncpy(error_buffer, memcached_last_error_message(memc_ptr), error_buffer_size);
}
if (rc== MEMCACHED_SUCCESS && memcached_behavior_get(memc_ptr, MEMCACHED_BEHAVIOR_LOAD_FROM_FILE))
if (rc != MEMCACHED_SUCCESS && error_buffer && error_buffer_size)
{
- strncpy(error_buffer, error_buffer_size, memcached_last_error_message(memc_ptr));
+ strncpy(error_buffer, memcached_last_error_message(memc_ptr), error_buffer_size);
}
}
memcached_return_t memcached_parse_configuration(memcached_st *self, char const *option_string, size_t length)
{
- type_st pp;
- memset(&pp, 0, sizeof(type_st));
-
WATCHPOINT_ASSERT(self);
if (! self)
return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, NULL);
- pp.buf= option_string;
- pp.memc= self;
- pp.length= length;
- libmemcached_lex_init(&pp.yyscanner);
- libmemcached_set_extra(&pp, pp.yyscanner);
- bool success= libmemcached_parse(&pp, pp.yyscanner) == 0;
- libmemcached_lex_destroy(pp.yyscanner);
+ memcached_return_t rc;
+ Context context(option_string, length, self, rc);
- if (not success)
- return memcached_set_error(self, MEMCACHED_PARSE_ERROR, NULL);
+ context.start();
- return MEMCACHED_SUCCESS;
+ return rc;
}
void memcached_set_configuration_file(memcached_st *self, const char *filename, size_t filename_length)