X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcallback.c;h=aba1a383670afd4cf0d297b9f54de423a259dc6f;hb=3e49b97973fffed605aaa7a706c3ea0e23963ac2;hp=b0ddfc2ba0d394c311ba9c39f39c1703cc6a2d97;hpb=7c7750f02368b570353ea109f23a0ea26d226e02;p=awesomized%2Flibmemcached

diff --git a/libmemcached/callback.c b/libmemcached/callback.c
index b0ddfc2b..aba1a383 100644
--- a/libmemcached/callback.c
+++ b/libmemcached/callback.c
@@ -9,17 +9,15 @@
  *
  */
 
-#include "common.h" 
+#include "common.h"
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
 
-/* 
+/*
   These functions provide data and function callback support
 */
 
-memcached_return_t memcached_callback_set(memcached_st *ptr, 
-                                          memcached_callback_t flag, 
+memcached_return_t memcached_callback_set(memcached_st *ptr,
+                                          const memcached_callback_t flag,
                                           void *data)
 {
   switch (flag)
@@ -38,7 +36,7 @@ memcached_return_t memcached_callback_set(memcached_st *ptr,
         }
 
         if ((key_length > MEMCACHED_PREFIX_KEY_MAX_SIZE -1)
-            || (strcpy(ptr->prefix_key, key) == NULL))
+            || (strncpy(ptr->prefix_key, key, MEMCACHED_PREFIX_KEY_MAX_SIZE) == NULL))
         {
           ptr->prefix_key_length= 0;
           return MEMCACHED_BAD_KEY_PROVIDED;
@@ -50,7 +48,7 @@ memcached_return_t memcached_callback_set(memcached_st *ptr,
       }
       else
       {
-        memset(ptr->prefix_key, 0, MEMCACHED_PREFIX_KEY_MAX_SIZE);
+        ptr->prefix_key[0]= 0;
         ptr->prefix_key_length= 0;
       }
 
@@ -105,6 +103,7 @@ memcached_return_t memcached_callback_set(memcached_st *ptr,
       ptr->delete_trigger= func;
       break;
     }
+  case MEMCACHED_CALLBACK_MAX:
   default:
     return MEMCACHED_FAILURE;
   }
@@ -112,8 +111,8 @@ memcached_return_t memcached_callback_set(memcached_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
-void *memcached_callback_get(memcached_st *ptr, 
-                             memcached_callback_t flag,
+void *memcached_callback_get(memcached_st *ptr,
+                             const memcached_callback_t flag,
                              memcached_return_t *error)
 {
   memcached_return_t local_error;
@@ -125,15 +124,15 @@ void *memcached_callback_get(memcached_st *ptr,
   {
   case MEMCACHED_CALLBACK_PREFIX_KEY:
     {
-      if (ptr->prefix_key[0] == 0)
+      if (ptr->prefix_key_length)
       {
-        *error= MEMCACHED_FAILURE;
-        return NULL;
+        *error= MEMCACHED_SUCCESS;
+        return (void *)ptr->prefix_key;
       }
       else
       {
-        *error= MEMCACHED_SUCCESS;
-        return (void *)ptr->prefix_key;
+        *error= MEMCACHED_FAILURE;
+        return NULL;
       }
     }
   case MEMCACHED_CALLBACK_USER_DATA:
@@ -178,6 +177,7 @@ void *memcached_callback_get(memcached_st *ptr,
       *error= ptr->delete_trigger ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
       return *(void **)&ptr->delete_trigger;
     }
+  case MEMCACHED_CALLBACK_MAX:
   default:
     WATCHPOINT_ASSERT(0);
     *error= MEMCACHED_FAILURE;