[Groonga-commit] groonga/groonga at 7644b01 [master] clang: suppress warnings

Back to archive index

Kouhei Sutou null+****@clear*****
Tue Jun 11 16:51:31 JST 2013


Kouhei Sutou	2013-06-11 16:51:31 +0900 (Tue, 11 Jun 2013)

  New Revision: 7644b0150d2adaf4987f27cb5240df76ec2cc36b
  https://github.com/groonga/groonga/commit/7644b0150d2adaf4987f27cb5240df76ec2cc36b

  Message:
    clang: suppress warnings
    
    Add missing casts.
    
        lib/token.c:162:21: warning: assigning to
              'const unsigned char *' from 'const char *' converts between pointers to
              integer types with different sign [-Wpointer-sign]
            tokenizer->next =
                            ^
        lib/token.c:190:56: warning: passing
              'const unsigned char *' to parameter of type 'const char *' converts
              between pointers to integer types with different sign [-Wpointer-sign]
            grn_tokenizer_token_push(ctx, &(tokenizer->token), p, r - p, status);
                                                               ^
        include/groonga/tokenizer.h:183:61: note:
              passing argument to parameter 'str_ptr' here
          ...const char *str_ptr, unsigned int str_length,
                         ^

  Modified files:
    lib/token.c

  Modified: lib/token.c (+11 -6)
===================================================================
--- lib/token.c    2013-06-11 16:49:20 +0900 (caf3036)
+++ lib/token.c    2013-06-11 16:51:31 +0900 (29b4fb8)
@@ -160,11 +160,12 @@ delimited_next(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data
     unsigned int rest_length;
     rest_length = tokenizer->end - tokenizer->next;
     tokenizer->next =
-      grn_tokenizer_tokenized_delimiter_next(ctx,
-                                             &(tokenizer->token),
-                                             (const char *)tokenizer->next,
-                                             rest_length,
-                                             tokenizer->query->encoding);
+      (unsigned char *)grn_tokenizer_tokenized_delimiter_next(
+        ctx,
+        &(tokenizer->token),
+        (const char *)tokenizer->next,
+        rest_length,
+        tokenizer->query->encoding);
   } else {
     size_t cl;
     const unsigned char *p = tokenizer->next, *r;
@@ -187,7 +188,11 @@ delimited_next(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data
     } else {
       status = GRN_TOKENIZER_CONTINUE;
     }
-    grn_tokenizer_token_push(ctx, &(tokenizer->token), p, r - p, status);
+    grn_tokenizer_token_push(ctx,
+                             &(tokenizer->token),
+                             (const char *)p,
+                             r - p,
+                             status);
   }
 
   return NULL;
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index