An interesting refactoring + more expressive internal API

[redis.git] / sds.h

diff --git a/sds.h b/sds.h
index 582cb2f34773988d0793089687c3b4dd11537555..c8b42f7743cf4820776e5b68e98ebd5d854b2975 100644 (file)
--- a/sds.h
+++ b/sds.h
@@ -1,6 +1,6 @@
 /* SDSLib, A C dynamic strings library
  *
 /* SDSLib, A C dynamic strings library
  *

- * Copyright (c) 2006-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -32,14 +32,12 @@
 #define __SDS_H
 
 #include <sys/types.h>
 #define __SDS_H
 
 #include <sys/types.h>

-#include <limits.h>

 
 typedef char *sds;
 
 struct sdshdr {
 
 typedef char *sds;
 
 struct sdshdr {

-    int len;
-    unsigned short free;
-    unsigned short _len; /* USHRT_MAX if it is a "long" sds string */
+    long len;
+    long free;

     char buf[];
 };
 
     char buf[];
 };
 


@@ -54,12 +52,20 @@ sds sdscatlen(sds s, void *t, size_t len);
 sds sdscat(sds s, char *t);
 sds sdscpylen(sds s, char *t, size_t len);
 sds sdscpy(sds s, char *t);
 sds sdscat(sds s, char *t);
 sds sdscpylen(sds s, char *t, size_t len);
 sds sdscpy(sds s, char *t);

+
+#ifdef __GNUC__
+sds sdscatprintf(sds s, const char *fmt, ...)
+    __attribute__((format(printf, 2, 3)));
+#else

 sds sdscatprintf(sds s, const char *fmt, ...);
 sds sdscatprintf(sds s, const char *fmt, ...);

+#endif
+

 sds sdstrim(sds s, const char *cset);
 sds sdsrange(sds s, long start, long end);
 void sdsupdatelen(sds s);
 int sdscmp(sds s1, sds s2);
 sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count);
 void sdstolower(sds s);
 sds sdstrim(sds s, const char *cset);
 sds sdsrange(sds s, long start, long end);
 void sdsupdatelen(sds s);
 int sdscmp(sds s1, sds s2);
 sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count);
 void sdstolower(sds s);

+void sdstoupper(sds s);

 
 #endif
 
 #endif