Browse Source

Update and split out C interface from vector.

Brian Aker 12 years ago
parent
commit
6046d2bcaa

+ 1 - 0
libgearman/actions.cc

@@ -42,6 +42,7 @@
 #include <libgearman/result.hpp>
 
 #include "libgearman/assert.hpp"
+#include "libgearman/vector.h"
 
 #include <memory>
 

+ 1 - 0
libgearman/add.cc

@@ -45,6 +45,7 @@
 
 #include "libgearman/assert.hpp"
 
+#include "libgearman/vector.h"
 #include "libgearman/uuid.hpp"
 #include "libhashkit-1.0/hashkit.h"
 

+ 3 - 1
libgearman/function/base.hpp

@@ -2,7 +2,7 @@
  * 
  *  Gearmand client and server library.
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -40,6 +40,8 @@
 #include <cstring>
 #include <memory>
 
+#include "libgearman/vector.h"
+
 enum gearman_function_error_t {
   GEARMAN_FUNCTION_SUCCESS= GEARMAN_SUCCESS,
   GEARMAN_FUNCTION_INVALID_ARGUMENT= GEARMAN_INVALID_ARGUMENT,

+ 1 - 0
libgearman/include.am

@@ -19,6 +19,7 @@ noinst_HEADERS+= libgearman/client.h
 noinst_HEADERS+= libgearman/job.h
 noinst_HEADERS+= libgearman/pipe.h
 noinst_HEADERS+= libgearman/uuid.hpp
+noinst_HEADERS+= libgearman/vector.h
 noinst_HEADERS+= \
 		 libgearman/actions.hpp \
 		 libgearman/add.hpp \

+ 1 - 0
libgearman/job.cc

@@ -41,6 +41,7 @@
 #include <libgearman/common.h>
 
 #include "libgearman/assert.hpp"
+#include "libgearman/vector.h"
 
 #include <cstdio>
 #include <cstring>

+ 1 - 0
libgearman/protocol/submit.cc

@@ -37,6 +37,7 @@
 
 #include "gear_config.h"
 #include <libgearman/common.h>
+#include "libgearman/vector.h"
 
 #include <cstdio>
 #include <cstring>

+ 1 - 0
libgearman/result.cc

@@ -42,6 +42,7 @@
 
 #include "libgearman-1.0/visibility.h"
 #include "libgearman-1.0/result.h"
+#include "libgearman/vector.h"
 
 #include <cstdlib>
 #include <limits>

+ 0 - 1
libgearman/result.hpp

@@ -161,7 +161,6 @@ struct gearman_result_st
 
   ~gearman_result_st()
   {
-    gearman_string_free(&value.string);
   }
 
 private:

+ 1 - 0
libgearman/universal.cc

@@ -47,6 +47,7 @@
 
 #include "libgearman/assert.hpp"
 #include "libgearman/server_options.hpp"
+#include "libgearman/vector.h"
 
 #include <cerrno>
 #include <cstdarg>

+ 3 - 1
libgearman/vector.cc

@@ -40,6 +40,7 @@
 #include "libgearman/assert.hpp"
 #include "libgearman/is.hpp"
 #include "libgearman/vector.hpp"
+#include "libgearman/vector.h"
 
 #include <cstdlib>
 #include <cstdio>
@@ -388,13 +389,14 @@ bool gearman_vector_st::resize(const size_t size_)
   return true;
 }
 
-void gearman_string_free(gearman_vector_st *string)
+void gearman_string_free(gearman_vector_st*& string)
 {
   if (string)
   {
     if (gearman_is_allocated(string))
     {
       delete string;
+      string= NULL;
       return;
     }
 

Some files were not shown because too many files changed in this diff