瀏覽代碼

Merge pull request #69 from fperrad/20160506_lint

20160506 lint
Troy D. Hanson 9 年之前
父節點
當前提交
22646fcb7c
共有 3 個文件被更改,包括 8 次插入8 次删除
  1. 6 6
      src/ringbuf.h
  2. 1 1
      src/utarray.h
  3. 1 1
      src/utstring.h

+ 6 - 6
src/ringbuf.h

@@ -16,11 +16,11 @@ typedef struct _ringbuf {
 } ringbuf;
 
 ringbuf *ringbuf_new(size_t sz);
-int ringbuf_put(ringbuf *, const void *data, size_t len);
-size_t ringbuf_get_pending_size(ringbuf *);
-size_t ringbuf_get_next_chunk(ringbuf *, char **data);
-void ringbuf_mark_consumed(ringbuf *, size_t);
-void ringbuf_free(ringbuf*);
-void ringbuf_clear(ringbuf*);
+int ringbuf_put(ringbuf *r, const void *data, size_t len);
+size_t ringbuf_get_pending_size(ringbuf *r);
+size_t ringbuf_get_next_chunk(ringbuf *r, char **data);
+void ringbuf_mark_consumed(ringbuf *r, size_t len);
+void ringbuf_free(ringbuf *r);
+void ringbuf_clear(ringbuf *r);
 
 #endif /* _RINGBUF_H_ */

+ 1 - 1
src/utarray.h

@@ -228,7 +228,7 @@ static void utarray_str_cpy(void *dst, const void *src) {
 }
 static void utarray_str_dtor(void *elt) {
   char **eltc = (char**)elt;
-  if (*eltc) free(*eltc);
+  if (*eltc != NULL) free(*eltc);
 }
 static const UT_icd ut_str_icd _UNUSED_ = {sizeof(char*),NULL,utarray_str_cpy,utarray_str_dtor};
 static const UT_icd ut_int_icd _UNUSED_ = {sizeof(int),NULL,NULL,NULL};

+ 1 - 1
src/utstring.h

@@ -124,7 +124,7 @@ do {                                                             \
 _UNUSED_ static void utstring_printf_va(UT_string *s, const char *fmt, va_list ap) {
    int n;
    va_list cp;
-   while (1) {
+   for (;;) {
 #ifdef _WIN32
       cp = ap;
 #else