fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

Obsolete SDS_ABORT_ON_OOM removed from sds.c

Browse Source
This commit is contained in:
antirez 2012-01-16 10:08:33 +01:00
parent bd068b15c2
commit 1596d6a61e
1 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/sds.c
View File

@ -26,16 +26,8 @@
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * 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 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*
* History:
*
* - 22 March 2011: History section created on top of sds.c
* - 22 March 2011: Fixed a problem with "\xab" escapes convertion in
* function sdssplitargs().
*/ */
#define SDS_ABORT_ON_OOM
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -44,11 +36,6 @@
#include "sds.h" #include "sds.h"
#include "zmalloc.h" #include "zmalloc.h"
static void sdsOomAbort(void) {
fprintf(stderr,"SDS: Out Of Memory (SDS_ABORT_ON_OOM defined)\n");
abort();
}
sds sdsnewlen(const void *init, size_t initlen) { sds sdsnewlen(const void *init, size_t initlen) {
struct sdshdr *sh; struct sdshdr *sh;
@ -57,11 +44,7 @@ sds sdsnewlen(const void *init, size_t initlen) {
} else { } else {
sh = zcalloc(sizeof(struct sdshdr)+initlen+1); sh = zcalloc(sizeof(struct sdshdr)+initlen+1);
} }
#ifdef SDS_ABORT_ON_OOM
if (sh == NULL) sdsOomAbort();
#else
if (sh == NULL) return NULL; if (sh == NULL) return NULL;
#endif
sh->len = initlen; sh->len = initlen;
sh->free = 0; sh->free = 0;
if (initlen && init) if (initlen && init)
@ -122,11 +105,7 @@ sds sdsMakeRoomFor(sds s, size_t addlen) {
else else
newlen += SDS_MAX_PREALLOC; newlen += SDS_MAX_PREALLOC;
newsh = zrealloc(sh, sizeof(struct sdshdr)+newlen+1); newsh = zrealloc(sh, sizeof(struct sdshdr)+newlen+1);
#ifdef SDS_ABORT_ON_OOM
if (newsh == NULL) sdsOomAbort();
#else
if (newsh == NULL) return NULL; if (newsh == NULL) return NULL;
#endif
newsh->free = newlen - len; newsh->free = newlen - len;
return newsh->buf; return newsh->buf;
@ -232,11 +211,7 @@ sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
while(1) { while(1) {
buf = zmalloc(buflen); buf = zmalloc(buflen);
#ifdef SDS_ABORT_ON_OOM
if (buf == NULL) sdsOomAbort();
#else
if (buf == NULL) return NULL; if (buf == NULL) return NULL;
#endif
buf[buflen-2] = '\0'; buf[buflen-2] = '\0';
va_copy(cpy,ap); va_copy(cpy,ap);
vsnprintf(buf, buflen, fmt, cpy); vsnprintf(buf, buflen, fmt, cpy);
@ -356,11 +331,7 @@ sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count) {
if (seplen < 1 || len < 0) return NULL; if (seplen < 1 || len < 0) return NULL;
tokens = zmalloc(sizeof(sds)*slots); tokens = zmalloc(sizeof(sds)*slots);
#ifdef SDS_ABORT_ON_OOM
if (tokens == NULL) sdsOomAbort();
#else
if (tokens == NULL) return NULL; if (tokens == NULL) return NULL;
#endif
if (len == 0) { if (len == 0) {
*count = 0; *count = 0;
@ -373,25 +344,13 @@ sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count) {
slots *= 2; slots *= 2;
newtokens = zrealloc(tokens,sizeof(sds)*slots); newtokens = zrealloc(tokens,sizeof(sds)*slots);
if (newtokens == NULL) { if (newtokens == NULL) goto cleanup;
#ifdef SDS_ABORT_ON_OOM
sdsOomAbort();
#else
goto cleanup;
#endif
}
tokens = newtokens; tokens = newtokens;
} }
/* search the separator */ /* search the separator */
if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) { if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) {
tokens[elements] = sdsnewlen(s+start,j-start); tokens[elements] = sdsnewlen(s+start,j-start);
if (tokens[elements] == NULL) { if (tokens[elements] == NULL) goto cleanup;
#ifdef SDS_ABORT_ON_OOM
sdsOomAbort();
#else
goto cleanup;
#endif
}
elements++; elements++;
start = j+seplen; start = j+seplen;
j = j+seplen-1; /* skip the separator */ j = j+seplen-1; /* skip the separator */
@ -399,18 +358,11 @@ sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count) {
} }
/* Add the final element. We are sure there is room in the tokens array. */ /* Add the final element. We are sure there is room in the tokens array. */
tokens[elements] = sdsnewlen(s+start,len-start); tokens[elements] = sdsnewlen(s+start,len-start);
if (tokens[elements] == NULL) { if (tokens[elements] == NULL) goto cleanup;
#ifdef SDS_ABORT_ON_OOM
sdsOomAbort();
#else
goto cleanup;
#endif
}
elements++; elements++;
*count = elements; *count = elements;
return tokens; return tokens;
#ifndef SDS_ABORT_ON_OOM
cleanup: cleanup:
{ {
int i; int i;
@ -419,7 +371,6 @@ cleanup:
*count = 0; *count = 0;
return NULL; return NULL;
} }
#endif
} }
void sdsfreesplitres(sds *tokens, int count) { void sdsfreesplitres(sds *tokens, int count) {