ruby-changes:6672
From: nobu <ko1@a...>
Date: Wed, 23 Jul 2008 18:30:47 +0900 (JST)
Subject: [ruby-changes:6672] Ruby:r18188 (ruby_1_8, trunk): * ext/tk/{stubs,tcltklib}.c, ext/tk/tkutil/tkutil.c: fix warnings
nobu 2008-07-23 18:27:49 +0900 (Wed, 23 Jul 2008) New Revision: 18188 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18188 Log: * ext/tk/{stubs,tcltklib}.c, ext/tk/tkutil/tkutil.c: fix warnings about constness and signedness. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/ext/tk/depend branches/ruby_1_8/ext/tk/stubs.c branches/ruby_1_8/ext/tk/tcltklib.c branches/ruby_1_8/ext/tk/tkutil/tkutil.c trunk/ChangeLog trunk/ext/tk/depend trunk/ext/tk/stubs.c trunk/ext/tk/tcltklib.c trunk/ext/tk/tkutil/tkutil.c Index: ChangeLog =================================================================== --- ChangeLog (revision 18187) +++ ChangeLog (revision 18188) @@ -1,3 +1,8 @@ +Wed Jul 23 18:27:46 2008 Nobuyoshi Nakada <nobu@r...> + + * ext/tk/{stubs,tcltklib}.c, ext/tk/tkutil/tkutil.c: fix warnings + about constness and signedness. + Wed Jul 23 17:04:22 2008 Nobuyoshi Nakada <nobu@r...> * ext/openssl/openssl_missing.h (d2i_of_void): define for older Index: ext/tk/stubs.c =================================================================== --- ext/tk/stubs.c (revision 18187) +++ ext/tk/stubs.c (revision 18188) @@ -318,7 +318,7 @@ if ((*p_Tk_Init)(tcl_ip) == TCL_ERROR) return FAIL_Tk_Init; - if (!Tk_InitStubs(tcl_ip, "8.1", 0)) + if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0)) return FAIL_Tk_InitStubs; #ifdef __MACOS__ @@ -357,7 +357,7 @@ if ((*p_Tk_SafeInit)(tcl_ip) == TCL_ERROR) return FAIL_Tk_Init; - if (!Tk_InitStubs(tcl_ip, "8.1", 0)) + if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0)) return FAIL_Tk_InitStubs; #ifdef __MACOS__ Index: ext/tk/tcltklib.c =================================================================== --- ext/tk/tcltklib.c (revision 18187) +++ ext/tk/tcltklib.c (revision 18188) @@ -119,7 +119,7 @@ static const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE; /* finalize_proc_name */ -static char *finalize_hook_name = "INTERP_FINALIZE_HOOK"; +static const char finalize_hook_name[] = "INTERP_FINALIZE_HOOK"; static void ip_finalize _((Tcl_Interp*)); @@ -188,13 +188,14 @@ static VALUE ip_invoke _((int, VALUE*, VALUE)); static VALUE ip_invoke_with_position _((int, VALUE*, VALUE, Tcl_QueuePosition)); static VALUE tk_funcall _((VALUE(), int, VALUE*, VALUE)); +static VALUE callq_safelevel_handler _((VALUE, VALUE)); /* Tcl's object type */ #if TCL_MAJOR_VERSION >= 8 -static char *Tcl_ObjTypeName_ByteArray = "bytearray"; +static const char Tcl_ObjTypeName_ByteArray[] = "bytearray"; static Tcl_ObjType *Tcl_ObjType_ByteArray; -static char *Tcl_ObjTypeName_String = "string"; +static const char Tcl_ObjTypeName_String[] = "string"; static Tcl_ObjType *Tcl_ObjType_String; #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1) @@ -1044,12 +1045,12 @@ } else { /* string interface */ - char **argv; + CONST84 char **argv; #define USE_RUBY_ALLOC 0 #if USE_RUBY_ALLOC - argv = (char **)ALLOC_N(char *, 3); /* XXXXXXXXXX */ + argv = ALLOC_N(char *, 3); /* XXXXXXXXXX */ #else /* not USE_RUBY_ALLOC */ - argv = (char **)ckalloc(sizeof(char *) * 3); + argv = (CONST84 char **)ckalloc(sizeof(char *) * 3); #if 0 /* use Tcl_Preserve/Release */ Tcl_Preserve((ClientData)argv); /* XXXXXXXX */ #endif @@ -1059,8 +1060,7 @@ argv[1] = Tcl_GetStringFromObj(state_obj, (int*)NULL); argv[2] = (char *)NULL; - ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, - 2, (CONST84 char **)argv); + ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 2, argv); #if USE_RUBY_ALLOC free(argv); @@ -1502,7 +1502,7 @@ lib_num_of_mainwindows(self) VALUE self; { -#ifdef RUBY_VM /* Ruby 1.9+ !!! */ +#ifdef RUBY_USE_NATIVE_THREAD /* Ruby 1.9+ !!! */ return tk_funcall(lib_num_of_mainwindows_core, 0, (VALUE*)NULL, self); #else return lib_num_of_mainwindows_core(self, 0, (VALUE*)NULL); @@ -2944,7 +2944,9 @@ char *name; { volatile VALUE klass = rb_cObject; +#if 0 char *head, *tail; +#endif int state; #if SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER @@ -2994,8 +2996,9 @@ char *str; { volatile VALUE receiver; - volatile VALUE klass = rb_cObject; +#if !SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER int state; +#endif if (str[0] == ':' || ('A' <= str[0] && str[0] <= 'Z')) { /* class | module | constant */ @@ -6093,10 +6096,6 @@ int len, binary = 0; const char *s; volatile VALUE str; -#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 4) - int len2; - const char *s2; -#endif #if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0 s = Tcl_GetStringFromObj(obj, &len); @@ -6105,7 +6104,7 @@ /* TCL_VERSION 8.1 -- 8.3 */ if (Tcl_GetCharLength(obj) != Tcl_UniCharLen(Tcl_GetUnicode(obj))) { /* possibly binary string */ - s = Tcl_GetByteArrayFromObj(obj, &len); + s = (char *)Tcl_GetByteArrayFromObj(obj, &len); binary = 1; } else { /* possibly text string */ @@ -6113,7 +6112,7 @@ } #else /* TCL_VERSION >= 8.4 */ if (IS_TCL_BYTEARRAY(obj)) { - s = Tcl_GetByteArrayFromObj(obj, &len); + s = (char *)Tcl_GetByteArrayFromObj(obj, &len); binary = 1; } else { s = Tcl_GetStringFromObj(obj, &len); @@ -6153,7 +6152,7 @@ StringValue(enc); if (strcmp(RSTRING_PTR(enc), "binary") == 0) { /* binary string */ - return Tcl_NewByteArrayObj(s, RSTRING_LEN(str)); + return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str)); } else { /* text string */ return Tcl_NewStringObj(s, RSTRING_LEN(str)); @@ -6161,11 +6160,11 @@ #ifdef HAVE_RUBY_ENCODING_H } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) { /* binary string */ - return Tcl_NewByteArrayObj(s, RSTRING_LEN(str)); + return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str)); #endif } else if (strlen(s) != RSTRING_LEN(str)) { /* probably binary string */ - return Tcl_NewByteArrayObj(s, RSTRING_LEN(str)); + return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str)); } else { /* probably text string */ return Tcl_NewStringObj(s, RSTRING_LEN(str)); @@ -7343,7 +7342,7 @@ StringValue(str); tclstr = Tcl_NewStringObj(RSTRING_PTR(str), RSTRING_LEN(str)); Tcl_IncrRefCount(tclstr); - s = Tcl_GetByteArrayFromObj(tclstr, &len); + s = (char*)Tcl_GetByteArrayFromObj(tclstr, &len); str = rb_tainted_str_new(s, len); s = (char*)NULL; Tcl_DecrRefCount(tclstr); @@ -9195,7 +9194,7 @@ VALUE name; VALUE error_mode; { - struct tcltkip *ptr = get_ip(interp); + get_ip(interp); rb_secure(4); @@ -10148,6 +10147,8 @@ Tcl_ObjType_String = Tcl_GetObjType(Tcl_ObjTypeName_String); /* --------------------------------------------------------------- */ + + (void)call_original_exit; } /* eof */ Index: ext/tk/depend =================================================================== --- ext/tk/depend (revision 18187) +++ ext/tk/depend (revision 18188) @@ -1,2 +1,2 @@ -tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h -stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h +tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h stubs.h +stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h stubs.h Index: ext/tk/tkutil/tkutil.c =================================================================== --- ext/tk/tkutil/tkutil.c (revision 18187) +++ ext/tk/tkutil/tkutil.c (revision 18188) @@ -205,6 +205,7 @@ return tk_toUTF8(1, argv, self); } +#if 0 static VALUE fromUTF8_toDefaultEnc(str, self) VALUE str; @@ -215,6 +216,7 @@ argv[0] = str; return tk_fromUTF8(1, argv, self); } +#endif static int to_strkey(key, value, hash) @@ -968,12 +970,14 @@ } } +#if 0 static VALUE tkstr_to_dec(value) VALUE value; { return rb_cstr_to_inum(RSTRING_PTR(value), 10, 1); } +#endif static VALUE tkstr_to_int(value) @@ -1077,8 +1081,8 @@ struct cbsubst_info { int full_subst_length; int keylen[CBSUBST_TBL_MAX]; - unsigned char *key[CBSUBST_TBL_MAX]; - unsigned char type[CBSUBST_TBL_MAX]; + char *key[CBSUBST_TBL_MAX]; + char type[CBSUBST_TBL_MAX]; ID ivar[CBSUBST_TBL_MAX]; VALUE proc; VALUE aliases; @@ -1100,9 +1104,9 @@ if (ptr) { for(i = 0; i < CBSUBST_TBL_MAX; i++) { - if (ptr->key[i] != (unsigned char *)NULL) { + if (ptr->key[i] != NULL) { free(ptr->key[i]); - ptr->key[i] = (unsigned char *)NULL; + ptr->key[i] = NULL; } } free(ptr); @@ -1122,7 +1126,7 @@ for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) { inf->keylen[idx] = 0; - inf->key[idx] = (unsigned char *) NULL; + inf->key[idx] = NULL; inf->type[idx] = '\0'; inf->ivar[idx] = (ID) 0; } @@ -1240,7 +1244,7 @@ { struct cbsubst_info *inf; const char *str; - unsigned char *buf, *ptr; + char *buf, *ptr; int idx, len; ID id; volatile VALUE ret; @@ -1273,7 +1277,7 @@ ptr += len; } else { /* single char */ - *(ptr++) = idx; + *(ptr++) = (unsigned char)idx; } *(ptr++) = ' '; @@ -1294,7 +1298,7 @@ { struct cbsubst_info *inf; const char *str; - unsigned char *buf, *ptr; + char *buf, *ptr; int i, idx, len; ID id; volatile VALUE arg_sym, ret; @@ -1339,7 +1343,7 @@ ptr += len; } else { /* single char */ - *(ptr++) = idx; + *(ptr++) = (unsigned char)idx; } *(ptr++) = ' '; @@ -1364,7 +1368,7 @@ volatile VALUE ret; VALUE keyval; int i, len, keylen, idx; - unsigned char *buf, *ptr, *key; + char *buf, *ptr, *key; list = rb_funcall(cTclTkLib, ID_split_tklist, 1, str); len = RARRAY_LEN(list); @@ -1372,11 +1376,11 @@ Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), struct cbsubst_info, inf); - ptr = buf = ALLOC_N(unsigned char, inf->full_subst_length + len + 1); + ptr = buf = ALLOC_N(char, inf->full_subst_length + len + 1); for(i = 0; i < len; i++) { keyval = RARRAY_PTR(list)[i]; - key = (unsigned char*)RSTRING_PTR(keyval); + key = RSTRING_PTR(keyval); if (*key == '%') { if (*(key + 2) == '\0') { /* single char */ @@ -1386,7 +1390,7 @@ keylen = RSTRING_LEN(keyval) - 1; for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) { if (inf->keylen[idx] != keylen) continue; - if (inf->key[idx][0] != *(key + 1)) continue; + if ((unsigned char)inf->key[idx][0] != (unsigned char)*(key + 1)) continue; if (strncmp(inf->key[idx], key + 1, keylen)) continue; break; } @@ -1402,7 +1406,7 @@ } *ptr = '\0'; - ret = rb_str_new2((const char*)buf); + ret = rb_str_new2(buf); free(buf); return ret; } @@ -1412,16 +1416,16 @@ VALUE self; { struct cbsubst_info *inf; - unsigned char *buf, *ptr; - unsigned char *keys_buf, *keys_ptr; + char *buf, *ptr; + char *keys_buf, *keys_ptr; int idx, len; volatile VALUE ret; Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), struct cbsubst_info, inf); - ptr = buf = ALLOC_N(unsigned char, inf->full_subst_length + 1); - keys_ptr = keys_buf = ALLOC_N(unsigned char, CBSUBST_TBL_MAX + 1); + ptr = buf = ALLOC_N(char, inf->full_subst_length + 1); + keys_ptr = keys_buf = ALLOC_N(char, CBSUBST_TBL_MAX + 1); for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) { if (inf->ivar[idx] == (ID) 0) continue; @@ -1445,7 +1449,7 @@ *ptr = '\0'; *keys_ptr = '\0'; - ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2((const char*)buf)); + ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2(buf)); free(buf); free(keys_buf); Index: ruby_1_8/ext/tk/stubs.c =================================================================== --- ruby_1_8/ext/tk/stubs.c (revision 18187) +++ ruby_1_8/ext/tk/stubs.c (revision 18188) @@ -318,7 +318,7 @@ if ((*p_Tk_Init)(tcl_ip) == TCL_ERROR) return FAIL_Tk_Init; - if (!Tk_InitStubs(tcl_ip, "8.1", 0)) + if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0)) return FAIL_Tk_InitStubs; #ifdef __MACOS__ @@ -357,7 +357,7 @@ if ((*p_Tk_SafeInit)(tcl_ip) == TCL_ERROR) return FAIL_Tk_Init; - if (!Tk_InitStubs(tcl_ip, "8.1", 0)) + if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0)) return FAIL_Tk_InitStubs; #ifdef __MACOS__ Index: ruby_1_8/ext/tk/tcltklib.c =================================================================== --- ruby_1_8/ext/tk/tcltklib.c (revision 18187) +++ ruby_1_8/ext/tk/tcltklib.c (revision 18188) @@ -119,7 +119,7 @@ const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE; /* finalize_proc_name */ -static char *finalize_hook_name = "INTERP_FINALIZE_HOOK"; +static const char finalize_hook_name[] = "INTERP_FINALIZE_HOOK"; static void ip_finalize _((Tcl_Interp*)); @@ -188,13 +188,14 @@ static VALUE ip_invoke _((int, VALUE*, VALUE)); static VALUE ip_invoke_with_position _((int, VALUE*, VALUE, Tcl_QueuePosition)); static VALUE tk_funcall _((VALUE(), int, VALUE*, VALUE)); +static VALUE callq_safelevel_handler _((VALUE, VALUE)); /* Tcl's object type */ #if TCL_MAJOR_VERSION >= 8 -static char *Tcl_ObjTypeName_ByteArray = "bytearray"; +static const char Tcl_ObjTypeName_ByteArray[] = "bytearray"; static Tcl_ObjType *Tcl_ObjType_ByteArray; -static char *Tcl_ObjTypeName_String = "string"; +static const char Tcl_ObjTypeName_String[] = "string"; static Tcl_ObjType *Tcl_ObjType_String; #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1) @@ -1038,12 +1039,12 @@ } else { /* string interface */ - char **argv; + CONST84 char **argv; #define USE_RUBY_ALLOC 0 #if USE_RUBY_ALLOC - argv = (char **)ALLOC_N(char *, 3); /* XXXXXXXXXX */ + argv = ALLOC_N(char *, 3); /* XXXXXXXXXX */ #else /* not USE_RUBY_ALLOC */ - argv = (char **)ckalloc(sizeof(char *) * 3); + argv = (CONST84 char **)ckalloc(sizeof(char *) * 3); #if 0 /* use Tcl_Preserve/Release */ Tcl_Preserve((ClientData)argv); /* XXXXXXXX */ #endif @@ -1053,8 +1054,7 @@ argv[1] = Tcl_GetStringFromObj(state_obj, (int*)NULL); argv[2] = (char *)NULL; - ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, - 2, (CONST84 char **)argv); + ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 2, argv); #if USE_RUBY_ALLOC free(argv); @@ -2928,7 +2928,9 @@ char *name; { volatile VALUE klass = rb_cObject; +#if 0 char *head, *tail; +#endif int state; #if SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER @@ -2978,8 +2980,9 @@ char *str; { volatile VALUE receiver; - volatile VALUE klass = rb_cObject; +#if !SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER int state; +#endif if (str[0] == ':' || ('A' <= str[0] && str[0] <= 'Z')) { /* class | module | constant */ @@ -6077,10 +6080,6 @@ int len, binary = 0; const char *s; volatile VALUE str; -#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 4) - int len2; - const char *s2; -#endif #if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0 s = Tcl_GetStringFromObj(obj, &len); @@ -6089,7 +6088,7 @@ /* TCL_VERSION 8.1 -- 8.3 */ if (Tcl_GetCharLength(obj) != Tcl_UniCharLen(Tcl_GetUnicode(obj))) { /* possibly binary string */ - s = Tcl_GetByteArrayFromObj(obj, &len); + s = (char *)Tcl_GetByteArrayFromObj(obj, &len); binary = 1; } else { /* possibly text string */ @@ -6097,7 +6096,7 @@ } #else /* TCL_VERSION >= 8.4 */ if (IS_TCL_BYTEARRAY(obj)) { - s = Tcl_GetByteArrayFromObj(obj, &len); + s = (char *)Tcl_GetByteArrayFromObj(obj, &len); binary = 1; } else { s = Tcl_GetStringFromObj(obj, &len); @@ -6137,7 +6136,7 @@ StringValue(enc); if (strcmp(RSTRING_PTR(enc), "binary") == 0) { /* binary string */ - return Tcl_NewByteArrayObj(s, RSTRING_LEN(str)); + return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str)); } else { /* text string */ return Tcl_NewStringObj(s, RSTRING_LEN(str)); @@ -6145,11 +6144,11 @@ #ifdef HAVE_RUBY_ENCODING_H } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) { /* binary string */ - return Tcl_NewByteArrayObj(s, RSTRING_LEN(str)); + return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str)); #endif } else if (strlen(s) != RSTRING_LEN(str)) { /* probably binary string */ - return Tcl_NewByteArrayObj(s, RSTRING_LEN(str)); + return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str)); } else { /* probably text string */ return Tcl_NewStringObj(s, RSTRING_LEN(str)); @@ -7311,7 +7310,7 @@ StringValue(str); tclstr = Tcl_NewStringObj(RSTRING_PTR(str), RSTRING_LEN(str)); Tcl_IncrRefCount(tclstr); - s = Tcl_GetByteArrayFromObj(tclstr, &len); + s = (char*)Tcl_GetByteArrayFromObj(tclstr, &len); str = rb_tainted_str_new(s, len); s = (char*)NULL; Tcl_DecrRefCount(tclstr); @@ -8189,9 +8188,9 @@ #ifdef RUBY_USE_NATIVE_THREAD ptr = get_ip(ip_obj); - DUMP2("status: ptr->tk_thread_id %d", ptr->tk_thread_id); + DUMP2("status: ptr->tk_thread_id %p", ptr->tk_thread_id); #endif - DUMP2("status: Tcl_GetCurrentThread %d", Tcl_GetCurrentThread()); + DUMP2("status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread()); DUMP2("status: eventloopt_thread %lx", eventloop_thread); if ( @@ -9153,7 +9152,7 @@ VALUE name; VALUE error_mode; { - struct tcltkip *ptr = get_ip(interp); + get_ip(interp); rb_secure(4); @@ -9379,11 +9378,10 @@ { struct tcltkip *ptr; int retry = 0; - int i, idx, objc; + int i, objc; Tcl_Obj **objv; Tcl_Obj *enc_list; volatile VALUE encname = Qnil; - volatile VALUE encobj = Qnil; /* interpreter check */ if (NIL_P(interp)) return 0; @@ -9425,7 +9423,6 @@ VALUE error_mode; { volatile VALUE name = Qnil; - int retry = 0; enc = rb_funcall(enc, ID_to_s, 0, 0); name = rb_hash_lookup(table, enc); @@ -10106,6 +10103,8 @@ Tcl_ObjType_String = Tcl_GetObjType(Tcl_ObjTypeName_String); /* --------------------------------------------------------------- */ + + (void)call_original_exit; } /* eof */ Index: ruby_1_8/ext/tk/depend =================================================================== --- ruby_1_8/ext/tk/depend (revision 18187) +++ ruby_1_8/ext/tk/depend (revision 18188) @@ -1,2 +1,2 @@ -tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h -stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h +tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h stubs.h +stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h stubs.h Index: ruby_1_8/ext/tk/tkutil/tkutil.c =================================================================== --- ruby_1_8/ext/tk/tkutil/tkutil.c (revision 18187) +++ ruby_1_8/ext/tk/tkutil/tkutil.c (revision 18188) @@ -205,6 +205,7 @@ return tk_toUTF8(1, argv, self); } +#if 0 static VALUE fromUTF8_toDefaultEnc(str, self) VALUE str; @@ -215,6 +216,7 @@ argv[0] = str; return tk_fromUTF8(1, argv, self); } +#endif static int to_strkey(key, value, hash) @@ -968,12 +970,14 @@ } } +#if 0 static VALUE tkstr_to_dec(value) VALUE value; { return rb_cstr_to_inum(RSTRING_PTR(value), 10, 1); } +#endif static VALUE tkstr_to_int(value) @@ -1077,8 +1081,8 @@ struct cbsubst_info { int full_subst_length; int keylen[CBSUBST_TBL_MAX]; - unsigned char *key[CBSUBST_TBL_MAX]; - unsigned char type[CBSUBST_TBL_MAX]; + char *key[CBSUBST_TBL_MAX]; + char type[CBSUBST_TBL_MAX]; ID ivar[CBSUBST_TBL_MAX]; VALUE proc; VALUE aliases; @@ -1100,9 +1104,9 @@ if (ptr) { for(i = 0; i < CBSUBST_TBL_MAX; i++) { - if (ptr->key[i] != (unsigned char *)NULL) { + if (ptr->key[i] != NULL) { free(ptr->key[i]); - ptr->key[i] = (unsigned char *)NULL; + ptr->key[i] = NULL; } } free(ptr); @@ -1122,7 +1126,7 @@ for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) { inf->keylen[idx] = 0; - inf->key[idx] = (unsigned char *) NULL; + inf->key[idx] = NULL; inf->type[idx] = '\0'; inf->ivar[idx] = (ID) 0; } @@ -1240,7 +1244,7 @@ { struct cbsubst_info *inf; const char *str; - unsigned char *buf, *ptr; + char *buf, *ptr; int idx, len; ID id; volatile VALUE ret; @@ -1273,7 +1277,7 @@ ptr += len; } else { /* single char */ - *(ptr++) = idx; + *(ptr++) = (unsigned char)idx; } *(ptr++) = ' '; @@ -1294,7 +1298,7 @@ { struct cbsubst_info *inf; const char *str; - unsigned char *buf, *ptr; + char *buf, *ptr; int i, idx, len; ID id; volatile VALUE arg_sym, ret; @@ -1339,7 +1343,7 @@ ptr += len; } else { /* single char */ - *(ptr++) = idx; + *(ptr++) = (unsigned char)idx; } *(ptr++) = ' '; @@ -1364,7 +1368,7 @@ volatile VALUE ret; VALUE keyval; int i, len, keylen, idx; - unsigned char *buf, *ptr, *key; + char *buf, *ptr, *key; list = rb_funcall(cTclTkLib, ID_split_tklist, 1, str); len = RARRAY_LEN(list); @@ -1372,11 +1376,11 @@ Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), struct cbsubst_info, inf); - ptr = buf = ALLOC_N(unsigned char, inf->full_subst_length + len + 1); + ptr = buf = ALLOC_N(char, inf->full_subst_length + len + 1); for(i = 0; i < len; i++) { keyval = RARRAY_PTR(list)[i]; - key = (unsigned char*)RSTRING_PTR(keyval); + key = RSTRING_PTR(keyval); if (*key == '%') { if (*(key + 2) == '\0') { /* single char */ @@ -1386,7 +1390,7 @@ keylen = RSTRING_LEN(keyval) - 1; for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) { if (inf->keylen[idx] != keylen) continue; - if (inf->key[idx][0] != *(key + 1)) continue; + if ((unsigned char)inf->key[idx][0] != (unsigned char)*(key + 1)) continue; if (strncmp(inf->key[idx], key + 1, keylen)) continue; break; } @@ -1402,7 +1406,7 @@ } *ptr = '\0'; - ret = rb_str_new2((const char*)buf); + ret = rb_str_new2(buf); free(buf); return ret; } @@ -1412,16 +1416,16 @@ VALUE self; { struct cbsubst_info *inf; - unsigned char *buf, *ptr; - unsigned char *keys_buf, *keys_ptr; + char *buf, *ptr; + char *keys_buf, *keys_ptr; int idx, len; volatile VALUE ret; Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), struct cbsubst_info, inf); - ptr = buf = ALLOC_N(unsigned char, inf->full_subst_length + 1); - keys_ptr = keys_buf = ALLOC_N(unsigned char, CBSUBST_TBL_MAX + 1); + ptr = buf = ALLOC_N(char, inf->full_subst_length + 1); + keys_ptr = keys_buf = ALLOC_N(char, CBSUBST_TBL_MAX + 1); for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) { if (inf->ivar[idx] == (ID) 0) continue; @@ -1445,7 +1449,7 @@ *ptr = '\0'; *keys_ptr = '\0'; - ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2((const char*)buf)); + ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2(buf)); free(buf); free(keys_buf); Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 18187) +++ ruby_1_8/ChangeLog (revision 18188) @@ -1,5 +1,8 @@ -Wed Jul 23 18:05:59 2008 Nobuyoshi Nakada <nobu@r...> +Wed Jul 23 18:27:46 2008 Nobuyoshi Nakada <nobu@r...> + * ext/tk/{stubs,tcltklib}.c, ext/tk/tkutil/tkutil.c: fix warnings + about constness and signedness. + * ext/bigdecimal/bigdecimal.{c,h} (VpIsNegDoubleZero, VpItoV): unused. * ext/digest/digest.c (rb_digest_instance_inspect): consitifed. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/