From 9ad3090b40fabae0ccc1b3e156bfc84c4c62d47d Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Mon, 18 Jun 2012 22:50:16 -0400 Subject: [PATCH] Fix packaging issues. --- libmemcached/include.am | 103 ++++++++++++++++++----------------- libmemcached/instance.h | 2 +- libmemcached/instance.hpp | 17 +++--- libmemcached/server_list.hpp | 14 ++--- libtest/server.cc | 1 - 5 files changed, 69 insertions(+), 68 deletions(-) diff --git a/libmemcached/include.am b/libmemcached/include.am index 95616ddc..be04712c 100644 --- a/libmemcached/include.am +++ b/libmemcached/include.am @@ -24,6 +24,8 @@ noinst_HEADERS+= libmemcached/do.hpp noinst_HEADERS+= libmemcached/encoding_key.h noinst_HEADERS+= libmemcached/error.hpp noinst_HEADERS+= libmemcached/initialize_query.h +noinst_HEADERS+= libmemcached/instance.h +noinst_HEADERS+= libmemcached/instance.hpp noinst_HEADERS+= libmemcached/internal.h noinst_HEADERS+= libmemcached/io.h noinst_HEADERS+= libmemcached/io.hpp @@ -52,57 +54,56 @@ libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED libmemcached_libmemcached_la_SOURCES+= libmemcached/instance.cc -libmemcached_libmemcached_la_SOURCES+= \ - ${libhashkit_libhashkit_la_SOURCES} \ - libmemcached/allocators.cc \ - libmemcached/allocators.hpp \ - libmemcached/analyze.cc \ - libmemcached/array.c \ - libmemcached/auto.cc \ - libmemcached/backtrace.cc \ - libmemcached/behavior.cc \ - libmemcached/behavior.hpp \ - libmemcached/byteorder.cc \ - libmemcached/callback.cc \ - libmemcached/connect.cc \ - libmemcached/delete.cc \ - libmemcached/do.cc \ - libmemcached/dump.cc \ - libmemcached/error.cc \ - libmemcached/exist.cc \ - libmemcached/fetch.cc \ - libmemcached/flush.cc \ - libmemcached/flush_buffers.cc \ - libmemcached/get.cc \ - libmemcached/hash.cc \ - libmemcached/hash.hpp \ - libmemcached/hosts.cc \ - libmemcached/initialize_query.cc \ - libmemcached/io.cc \ - libmemcached/key.cc \ - libmemcached/memcached.cc \ - libmemcached/encoding_key.cc \ - libmemcached/namespace.cc \ - libmemcached/options.cc \ - libmemcached/parse.cc \ - libmemcached/purge.cc \ - libmemcached/quit.cc \ - libmemcached/quit.hpp \ - libmemcached/response.cc \ - libmemcached/result.cc \ - libmemcached/sasl.cc \ - libmemcached/server.cc \ - libmemcached/server_list.cc \ - libmemcached/server_list.hpp \ - libmemcached/stats.cc \ - libmemcached/storage.cc \ - libmemcached/strerror.cc \ - libmemcached/string.cc \ - libmemcached/touch.cc \ - libmemcached/verbosity.cc \ - libmemcached/version.cc \ - libmemcached/udp.cc \ - libmemcached/virtual_bucket.c +libmemcached_libmemcached_la_SOURCES+= ${libhashkit_libhashkit_la_SOURCES} +libmemcached_libmemcached_la_SOURCES+= libmemcached/allocators.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/allocators.hpp +libmemcached_libmemcached_la_SOURCES+= libmemcached/analyze.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/array.c +libmemcached_libmemcached_la_SOURCES+= libmemcached/auto.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/backtrace.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/behavior.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/behavior.hpp +libmemcached_libmemcached_la_SOURCES+= libmemcached/byteorder.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/callback.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/connect.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/delete.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/do.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/dump.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/error.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/exist.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/fetch.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/flush.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/flush_buffers.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/get.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/hash.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/hash.hpp +libmemcached_libmemcached_la_SOURCES+= libmemcached/hosts.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/initialize_query.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/io.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/key.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/memcached.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/encoding_key.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/namespace.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/options.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/parse.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/purge.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.hpp +libmemcached_libmemcached_la_SOURCES+= libmemcached/response.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/result.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/sasl.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/server.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/server_list.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/server_list.hpp +libmemcached_libmemcached_la_SOURCES+= libmemcached/stats.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/storage.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/strerror.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/string.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/touch.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/verbosity.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/version.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/udp.cc +libmemcached_libmemcached_la_SOURCES+= libmemcached/virtual_bucket.c libmemcached/options.cc: libmemcached/csl/parser.h diff --git a/libmemcached/instance.h b/libmemcached/instance.h index 77388d2c..16d509f0 100644 --- a/libmemcached/instance.h +++ b/libmemcached/instance.h @@ -2,7 +2,7 @@ * * Libmemcached library * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/libmemcached/instance.hpp b/libmemcached/instance.hpp index 3c9dea35..9ab3622a 100644 --- a/libmemcached/instance.hpp +++ b/libmemcached/instance.hpp @@ -2,7 +2,7 @@ * * Libmemcached library * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,15 +44,18 @@ struct memcached_instance_st *__instance_create_with(memcached_st *memc, const in_port_t port, uint32_t weight, const memcached_connection_t type); -void __instance_free(struct memcached_instance_st *); +const char *memcached_instance_name(const memcached_server_instance_st self); -memcached_server_st *memcached_instance_2_server(struct memcached_instance_st*); +in_port_t memcached_instance_port(const memcached_server_instance_st self); memcached_return_t memcached_instance_push(memcached_st *ptr, const struct memcached_instance_st*, uint32_t); -uint32_t memcached_instance_set_count(memcached_instance_st *servers, uint32_t count); -const char *memcached_instance_name(const memcached_server_instance_st self); -in_port_t memcached_instance_port(const memcached_server_instance_st self); -uint32_t memcached_instance_response_count(const memcached_instance_st* self); +memcached_server_st *memcached_instance_2_server(struct memcached_instance_st*); + uint32_t memcached_instance_count(const memcached_st* self); +uint32_t memcached_instance_response_count(const memcached_instance_st* self); + +uint32_t memcached_instance_set_count(memcached_instance_st *servers, uint32_t count); + +void __instance_free(struct memcached_instance_st *); diff --git a/libmemcached/server_list.hpp b/libmemcached/server_list.hpp index 3f722647..3dfe5fee 100644 --- a/libmemcached/server_list.hpp +++ b/libmemcached/server_list.hpp @@ -36,16 +36,14 @@ #pragma once +memcached_instance_st *memcached_instance_list(const memcached_st *); -uint32_t memcached_servers_set_count(memcached_server_list_st servers, uint32_t count); -uint32_t memcached_instance_set_count(memcached_instance_st* servers, uint32_t count); +uint32_t memcached_instance_count(const memcached_instance_st*); -memcached_instance_st *memcached_instance_list(const memcached_st *); +uint32_t memcached_instance_list_count(const memcached_st*); -void memcached_instance_set(memcached_st *self, memcached_instance_st* list); +uint32_t memcached_servers_set_count(memcached_server_list_st servers, uint32_t count); -void memcached_instance_list_free(memcached_instance_st* self, uint32_t); +void memcached_instance_list_free(memcached_instance_st* self, uint32_t count); -uint32_t memcached_server_list_count(const memcached_server_list_st self); -uint32_t memcached_instance_list_count(const memcached_st*); -uint32_t memcached_instance_count(const memcached_instance_st*); +void memcached_instance_set(memcached_st *self, memcached_instance_st* list); diff --git a/libtest/server.cc b/libtest/server.cc index a5d801a6..68a463b8 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -219,7 +219,6 @@ bool Server::start() { if (pid_file().empty() == false) { - Error << " here?"; Wait wait(pid_file(), 8); if (wait.successful() == false) -- 2.30.2