diff options
author | Pieter Noordhuis <pcnoordhuis@gmail.com> | 2011-04-19 23:10:45 +0200 |
---|---|---|
committer | Pieter Noordhuis <pcnoordhuis@gmail.com> | 2011-05-05 16:25:48 +0200 |
commit | ded614f803f56ad979da76485e74732ecdcc57fd (patch) | |
tree | f3c5d43491f85baa5b336398d539f461c88652f4 | |
parent | 9703b1b3dc59aa76a314373fff748e26bdd0466f (diff) | |
download | redis-ded614f803f56ad979da76485e74732ecdcc57fd.tar.gz |
Inline sdslen and sdsavail (thanks to @bitbckt)
-rw-r--r-- | src/sds.c | 12 | ||||
-rw-r--r-- | src/sds.h | 10 |
2 files changed, 11 insertions, 11 deletions
@@ -36,11 +36,11 @@ #define SDS_ABORT_ON_OOM -#include "sds.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> +#include "sds.h" #include "zmalloc.h" static void sdsOomAbort(void) { @@ -78,11 +78,6 @@ sds sdsnew(const char *init) { return sdsnewlen(init, initlen); } -size_t sdslen(const sds s) { - struct sdshdr *sh = (void*) (s-(sizeof(struct sdshdr))); - return sh->len; -} - sds sdsdup(const sds s) { return sdsnewlen(s, sdslen(s)); } @@ -92,11 +87,6 @@ void sdsfree(sds s) { zfree(s-sizeof(struct sdshdr)); } -size_t sdsavail(sds s) { - struct sdshdr *sh = (void*) (s-(sizeof(struct sdshdr))); - return sh->free; -} - void sdsupdatelen(sds s) { struct sdshdr *sh = (void*) (s-(sizeof(struct sdshdr))); int reallen = strlen(s); @@ -42,6 +42,16 @@ struct sdshdr { char buf[]; }; +static inline size_t sdslen(const sds s) { + struct sdshdr *sh = (void*)(s-(sizeof(struct sdshdr))); + return sh->len; +} + +static inline size_t sdsavail(const sds s) { + struct sdshdr *sh = (void*)(s-(sizeof(struct sdshdr))); + return sh->free; +} + sds sdsnewlen(const void *init, size_t initlen); sds sdsnew(const char *init); sds sdsempty(); |