Skip to content

Commit a2868ff

Browse files
knuknu
committed
* eval.c, file.c, gc.c, io.c, object.c, ruby.c, ruby.h, struct.c,
 ext/socket/socket.c: differentiate long and int; use proper printf type specifiers and do casts where appropriate. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 454abc5 commit a2868ff

File tree

10 files changed

+32
-26
lines changed

10 files changed

+32
-26
lines changed

‎ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Wed Oct 30 06:29:00 2002 Akinori MUSHA <knu@iDaemons.org>
2+
3+
* eval.c, file.c, gc.c, io.c, object.c, ruby.c, ruby.h, struct.c,
4+
ext/socket/socket.c: differentiate long and int; use proper
5+
printf type specifiers and do casts where appropriate.
6+
17
Wed Oct 30 04:07:33 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
28

39
* eval.c (error_print, rb_longjmp, rb_thread_schedule): flush

‎eval.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4722,7 +4722,7 @@ rb_call(klass, recv, mid, argc, argv, scope)
47224722
struct cache_entry *ent;
47234723

47244724
if (!klass) {
4725-
rb_raise(rb_eNotImpError, "method `%s' called on terminated object (0x%x)",
4725+
rb_raise(rb_eNotImpError, "method `%s' called on terminated object (0x%lx)",
47264726
rb_id2name(mid), recv);
47274727
}
47284728
/* is it in the method cache? */
@@ -9512,7 +9512,7 @@ rb_f_throw(argc, argv)
95129512
break;
95139513
}
95149514
if (tt->tag == PROT_THREAD) {
9515-
rb_raise(rb_eThreadError, "uncaught throw `%s' in thread 0x%x",
9515+
rb_raise(rb_eThreadError, "uncaught throw `%s' in thread 0x%lx",
95169516
rb_id2name(t),
95179517
curr_thread);
95189518
}
@@ -9549,7 +9549,7 @@ return_check()
95499549
break;
95509550
}
95519551
if (tt->tag == PROT_THREAD) {
9552-
rb_raise(rb_eThreadError, "return from within thread 0x%x",
9552+
rb_raise(rb_eThreadError, "return from within thread 0x%lx",
95539553
curr_thread);
95549554
}
95559555
tt = tt->prev;

‎ext/socket/socket.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -824,13 +824,13 @@ load_addr_info(h, serv, type, res)
824824
host = NULL;
825825
}
826826
if (FIXNUM_P(serv)) {
827-
snprintf(pbuf, sizeof(pbuf), "%ld", FIX2UINT(serv));
827+
snprintf(pbuf, sizeof(pbuf), "%u", FIX2UINT(serv));
828828
portp = pbuf;
829829
}
830830
else {
831831
SafeStringValue(serv);
832832
if (RSTRING(serv)->len >= sizeof(pbuf))
833-
rb_raise(rb_eArgError, "servicename too long (%d)", RSTRING(serv)->len);
833+
rb_raise(rb_eArgError, "servicename too long (%ld)", RSTRING(serv)->len);
834834
strcpy(pbuf, RSTRING(serv)->ptr);
835835
portp = pbuf;
836836
}
@@ -2126,7 +2126,7 @@ sock_s_getaddrinfo(argc, argv)
21262126
pptr = NULL;
21272127
}
21282128
else if (FIXNUM_P(port)) {
2129-
snprintf(pbuf, sizeof(pbuf), "%ld", FIX2INT(port));
2129+
snprintf(pbuf, sizeof(pbuf), "%d", FIX2INT(port));
21302130
pptr = pbuf;
21312131
}
21322132
else {
@@ -2227,7 +2227,7 @@ sock_s_getnameinfo(argc, argv)
22272227
}
22282228
}
22292229
else {
2230-
rb_raise(rb_eArgError, "array size should be 3 or 4, %d given",
2230+
rb_raise(rb_eArgError, "array size should be 3 or 4, %ld given",
22312231
RARRAY(sa)->len);
22322232
}
22332233
/* host */
@@ -2245,7 +2245,7 @@ sock_s_getnameinfo(argc, argv)
22452245
pptr = NULL;
22462246
}
22472247
else if (FIXNUM_P(port)) {
2248-
snprintf(pbuf, sizeof(pbuf), "%ld", NUM2INT(port));
2248+
snprintf(pbuf, sizeof(pbuf), "%d", NUM2INT(port));
22492249
pptr = pbuf;
22502250
}
22512251
else {
@@ -2331,7 +2331,7 @@ sock_s_unpack_sockaddr_in(self, addr)
23312331

23322332
sockaddr = (struct sockaddr_in*)StringValuePtr(addr);
23332333
if (RSTRING(addr)->len != sizeof(struct sockaddr_in)) {
2334-
rb_raise(rb_eTypeError, "sockaddr_in size differs - %d required; %d given",
2334+
rb_raise(rb_eTypeError, "sockaddr_in size differs - %ld required; %d given",
23352335
RSTRING(addr)->len, sizeof(struct sockaddr_in));
23362336
}
23372337
host = mkipaddr(sockaddr);
@@ -2365,7 +2365,7 @@ sock_s_unpack_sockaddr_un(self, addr)
23652365

23662366
sockaddr = (struct sockaddr_un*)StringValuePtr(addr);
23672367
if (RSTRING(addr)->len != sizeof(struct sockaddr_un)) {
2368-
rb_raise(rb_eTypeError, "sockaddr_un size differs - %d required; %d given",
2368+
rb_raise(rb_eTypeError, "sockaddr_un size differs - %ld required; %d given",
23692369
RSTRING(addr)->len, sizeof(struct sockaddr_un));
23702370
}
23712371
/* xxx: should I check against sun_path size? */

‎file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ rb_stat_inspect(self)
333333
if (i == 2) { /* mode */
334334
char buf[32];
335335

336-
sprintf(buf, "0%lo", NUM2INT(v));
336+
sprintf(buf, "0%o", NUM2INT(v));
337337
rb_str_buf_cat2(str, buf);
338338
}
339339
else if (i == 0 || i == 6) { /* dev/rdev */

‎gc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ rb_gc_mark_children(ptr)
856856
break;
857857

858858
default:
859-
rb_bug("rb_gc_mark(): unknown data type 0x%x(0x%x) %s",
859+
rb_bug("rb_gc_mark(): unknown data type 0x%lx(0x%lx) %s",
860860
obj->as.basic.flags & T_MASK, obj,
861861
is_pointer_to_heap(obj) ? "corrupted object" : "non object");
862862
}
@@ -1143,7 +1143,7 @@ obj_free(obj)
11431143
break;
11441144

11451145
default:
1146-
rb_bug("gc_sweep(): unknown data type 0x%x(%d)", obj,
1146+
rb_bug("gc_sweep(): unknown data type 0x%lx(%ld)", obj,
11471147
RANY(obj)->as.basic.flags & T_MASK);
11481148
}
11491149
}
@@ -1568,10 +1568,10 @@ id2ref(obj, id)
15681568

15691569
ptr = id ^ FIXNUM_FLAG; /* unset FIXNUM_FLAG */
15701570
if (!is_pointer_to_heap((void *)ptr)) {
1571-
rb_raise(rb_eRangeError, "0x%x is not id value", p0);
1571+
rb_raise(rb_eRangeError, "0x%lx is not id value", p0);
15721572
}
15731573
if (BUILTIN_TYPE(ptr) == 0) {
1574-
rb_raise(rb_eRangeError, "0x%x is recycled object", p0);
1574+
rb_raise(rb_eRangeError, "0x%lx is recycled object", p0);
15751575
}
15761576
return (VALUE)ptr;
15771577
}

‎io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ io_read(argc, argv, io)
786786

787787
len = NUM2LONG(length);
788788
if (len < 0) {
789-
rb_raise(rb_eArgError, "negative length %d given", len);
789+
rb_raise(rb_eArgError, "negative length %ld given", len);
790790
}
791791

792792
if (feof(fptr->f)) return Qnil;

‎object.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ rb_to_id(name)
776776
case T_FIXNUM:
777777
id = FIX2LONG(name);
778778
if (!rb_id2name(id)) {
779-
rb_raise(rb_eArgError, "%d is not a symbol", id);
779+
rb_raise(rb_eArgError, "%ld is not a symbol", id);
780780
}
781781
break;
782782
case T_SYMBOL:

‎ruby.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ set_arg0(val, id)
930930
}
931931
rb_progname = rb_tainted_str_new(s, i);
932932
#elif defined(HAVE_SETPROCTITLE)
933-
setproctitle("%.*s", i, s);
933+
setproctitle("%.*s", (int)i, s);
934934
rb_progname = rb_tainted_str_new(s, i);
935935
#else
936936
if (len == 0) {

‎ruby.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,10 @@ int rb_fix2int _((VALUE));
240240
#define NUM2UINT(x) ((unsigned int)NUM2INT(x))
241241
#define FIX2UINT(x) ((unsigned int)FIX2INT(x))
242242
#else
243-
#define NUM2INT(x) NUM2LONG(x)
244-
#define NUM2UINT(x) NUM2ULONG(x)
245-
#define FIX2INT(x) FIX2LONG(x)
246-
#define FIX2UINT(x) FIX2ULONG(x)
243+
#define NUM2INT(x) ((int)NUM2LONG(x))
244+
#define NUM2UINT(x) ((unsigned int)NUM2ULONG(x))
245+
#define FIX2INT(x) ((int)FIX2LONG(x))
246+
#define FIX2UINT(x) ((unsigned int)FIX2ULONG(x))
247247
#endif
248248

249249
#if HAVE_LONG_LONG

‎struct.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,10 +472,10 @@ rb_struct_aref(s, idx)
472472
i = NUM2LONG(idx);
473473
if (i < 0) i = RSTRUCT(s)->len + i;
474474
if (i < 0)
475-
rb_raise(rb_eIndexError, "offset %d too small for struct(size:%d)",
475+
rb_raise(rb_eIndexError, "offset %ld too small for struct(size:%ld)",
476476
i, RSTRUCT(s)->len);
477477
if (RSTRUCT(s)->len <= i)
478-
rb_raise(rb_eIndexError, "offset %d too large for struct(size:%d)",
478+
rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
479479
i, RSTRUCT(s)->len);
480480
return RSTRUCT(s)->ptr[i];
481481
}
@@ -517,11 +517,11 @@ rb_struct_aset(s, idx, val)
517517
i = NUM2LONG(idx);
518518
if (i < 0) i = RSTRUCT(s)->len + i;
519519
if (i < 0) {
520-
rb_raise(rb_eIndexError, "offset %d too small for struct(size:%d)",
520+
rb_raise(rb_eIndexError, "offset %ld too small for struct(size:%ld)",
521521
i, RSTRUCT(s)->len);
522522
}
523523
if (RSTRUCT(s)->len <= i) {
524-
rb_raise(rb_eIndexError, "offset %d too large for struct(size:%d)",
524+
rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
525525
i, RSTRUCT(s)->len);
526526
}
527527
rb_struct_modify(s);

0 commit comments

Comments
 (0)