summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Noordhuis <pcnoordhuis@gmail.com>2010-10-31 17:14:58 +0100
committerPieter Noordhuis <pcnoordhuis@gmail.com>2010-10-31 17:21:49 +0100
commit1d4f16b57108734d6ab591791a8e0cae223972e6 (patch)
treea9b9d8573f607d15937ffa96ec4c6fdb3a618a9e
parent154097445c62349a636e81488589c204ec241f01 (diff)
Extract OOM killer to util.h
-rw-r--r--hiredis.c7
-rw-r--r--util.h39
2 files changed, 40 insertions, 6 deletions
diff --git a/hiredis.c b/hiredis.c
index b70ffe3..9eafefe 100644
--- a/hiredis.c
+++ b/hiredis.c
@@ -37,6 +37,7 @@
#include "hiredis.h"
#include "anet.h"
#include "sds.h"
+#include "util.h"
typedef struct redisReader {
struct redisReplyObjectFunctions *fn;
@@ -66,12 +67,6 @@ static redisReplyObjectFunctions defaultFunctions = {
freeReplyObject
};
-/* We simply abort on out of memory */
-static void redisOOM(void) {
- fprintf(stderr,"Out of memory in hiredis.c");
- exit(1);
-}
-
/* Create a reply object */
static redisReply *createReplyObject(int type) {
redisReply *r = calloc(sizeof(*r),1);
diff --git a/util.h b/util.h
new file mode 100644
index 0000000..16914f8
--- /dev/null
+++ b/util.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Redis nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __UTIL_H
+#define __UTIL_H
+
+/* Abort on out of memory */
+static void redisOOM(void) {
+ fprintf(stderr,"Out of memory in hiredis");
+ exit(1);
+}
+
+#endif