--PGNNI9BzQDUtgA2J Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun 27 Feb 2005 at 09:37:02 +0900, Ian Macdonald wrote: > The patch against 1.8.2 is a little different, so I include that here, > too. Sigh. I accidentally got some other crap caught up in that patch. Let's try again. Ian -- Ian Macdonald | "Here's something to think about: How come System Administrator | you never see a headline like `Psychic ian / caliban.org | Wins Lottery.'" -- Comedian Jay Leno http://www.caliban.org | | --PGNNI9BzQDUtgA2J Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="ruby-1.8.2-raise.diff" diff -uNr ruby-1.8.2.orig/ruby-1.8.2/array.c ruby-1.8.2/ruby-1.8.2/array.c --- ruby-1.8.2.orig/ruby-1.8.2/array.c 2004-11-17 19:47:14.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/array.c 2005-02-26 15:45:24.821483704 -0800 @@ -2135,7 +2135,7 @@ } } else if (elen ! ARRAY(tmp)->len) { - rb_raise(rb_eIndexError, "element size differ (%d should be %d)", + rb_raise(rb_eIndexError, "element size differs (%d should be %d)", RARRAY(tmp)->len, elen); } for (j j<elen; j++) { diff -uNr ruby-1.8.2.orig/ruby-1.8.2/bignum.c ruby-1.8.2/ruby-1.8.2/bignum.c --- ruby-1.8.2.orig/ruby-1.8.2/bignum.c 2004-11-16 11:43:24.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/bignum.c 2005-02-26 15:45:24.822483552 -0800 @@ -1971,7 +1971,7 @@ return rb_assoc_new(rb_int2big(FIX2LONG(y)), x); } else { - rb_raise(rb_eTypeError, "Can't coerce %s to Bignum", + rb_raise(rb_eTypeError, "can't coerce %s to Bignum", rb_obj_classname(y)); } /* not reached */ diff -uNr ruby-1.8.2.orig/ruby-1.8.2/error.c ruby-1.8.2/ruby-1.8.2/error.c --- ruby-1.8.2.orig/ruby-1.8.2/error.c 2004-11-10 08:53:26.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/error.c 2005-02-26 15:45:24.823483400 -0800 @@ -1080,7 +1080,7 @@ rb_notimplement() { rb_raise(rb_eNotImpError, - "The %s() function is unimplemented on this machine", + "the %s() function is unimplemented on this machine", rb_id2name(ruby_frame->last_func)); } diff -uNr ruby-1.8.2.orig/ruby-1.8.2/eval.c ruby-1.8.2/ruby-1.8.2/eval.c --- ruby-1.8.2.orig/ruby-1.8.2/eval.c 2004-12-17 18:07:29.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/eval.c 2005-02-26 15:45:24.828482640 -0800 @@ -5449,7 +5449,7 @@ argv[11], argv[12], argv[13], argv[14]); break; default: - rb_raise(rb_eArgError, "too many arguments(%d)", len); + rb_raise(rb_eArgError, "too many arguments (%d)", len); break; } return Qnil; /* not reached */ @@ -5502,7 +5502,7 @@ int len ody->nd_argc; if (len < -2) { - rb_bug("bad argc(%d) specified for `%s(%s)'", + rb_bug("bad argc (%d) specified for `%s(%s)'", len, rb_class2name(klass), rb_id2name(id)); } if (trace_func) { @@ -6002,7 +6002,7 @@ if (NIL_P(level)) lev ; else lev UM2INT(level); - if (lev < 0) rb_raise(rb_eArgError, "negative level(%d)", lev); + if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev); return backtrace(lev); } @@ -6794,7 +6794,7 @@ load_failed(fname) VALUE fname; { - rb_raise(rb_eLoadError, "No such file to load -- %s", RSTRING(fname)->ptr); + rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING(fname)->ptr); } VALUE @@ -8787,7 +8787,7 @@ Data_Get_Struct(method, struct METHOD, data); if (data->recv Qundef) { - rb_raise(rb_eTypeError, "you cannot call unbound method; bind first"); + rb_raise(rb_eTypeError, "can't call unbound method; bind first"); } PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT); PUSH_TAG(PROT_NONE); diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/Win32API/Win32API.c ruby-1.8.2/ruby-1.8.2/ext/Win32API/Win32API.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/Win32API/Win32API.c 2003-08-12 21:52:35.000000000 -0700 +++ ruby-1.8.2/ruby-1.8.2/ext/Win32API/Win32API.c 2005-02-26 15:45:24.840480816 -0800 @@ -160,7 +160,7 @@ if (items ! import) - rb_raise(rb_eRuntimeError, "Wrong number of parameters: expected %d, got %d.\n", + rb_raise(rb_eRuntimeError, "wrong number of parameters: expected %d, got %d", nimport, items); for (i ; i < nimport; i++) { diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/bigdecimal/bigdecimal.c ruby-1.8.2/ruby-1.8.2/ext/bigdecimal/bigdecimal.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/bigdecimal/bigdecimal.c 2004-10-19 03:25:20.000000000 -0700 +++ ruby-1.8.2/ruby-1.8.2/ext/bigdecimal/bigdecimal.c 2005-02-26 15:45:24.842480512 -0800 @@ -202,7 +202,7 @@ /* First get max prec */ while((*pch)! nsigned char)'\0' && (ch ch++)! nsigned char)':') { if(!ISDIGIT(ch)) { - rb_raise(rb_eTypeError, "Load failed: invalid character in the marshaled string"); + rb_raise(rb_eTypeError, "load failed: invalid character in the marshaled string"); } m *10 + (unsigned long)(ch-'0'); } @@ -230,7 +230,7 @@ fo pGetException(); if(val nil) return INT2FIX(fo); if(val!alse && val! rue) { - rb_raise(rb_eTypeError, "The second argument must be true or false."); + rb_raise(rb_eTypeError, "second argument must be true or false"); return Qnil; /* Not reached */ } if(f&VP_EXCEPTION_INFINITY) { @@ -250,13 +250,13 @@ if(val nil) return INT2FIX(fo); Check_Type(val, T_FIXNUM); if(!VpIsRoundMode(FIX2INT(val))) { - rb_raise(rb_eTypeError, "Invalid rounding mode."); + rb_raise(rb_eTypeError, "invalid rounding mode"); return Qnil; } fo pSetRoundMode((unsigned long)FIX2INT(val)); return INT2FIX(fo); } - rb_raise(rb_eTypeError, "The first argument for BigDecimal#mode is invalid."); + rb_raise(rb_eTypeError, "first argument for BigDecimal#mode invalid"); return Qnil; } @@ -412,7 +412,7 @@ errno ; d2 ow(10.0,(double)e); if((errno ERANGE && e>0) || (d2>1.0 && (fabs(d) > (DBL_MAX / d2)))) { - VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion.",0); + VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0); if(d>0.0) return rb_float_new(DBL_MAX); else return rb_float_new(-DBL_MAX); } @@ -940,7 +940,7 @@ Check_Type(vRound, T_FIXNUM); sw IX2INT(vRound); if(!VpIsRoundMode(sw)) { - rb_raise(rb_eTypeError, "Invalid rounding mode."); + rb_raise(rb_eTypeError, "invalid rounding mode"); return Qnil; } break; @@ -3304,7 +3304,7 @@ es *((S_INT)BASE_FIG); e * 10 + exp_chr[i] - '0'; if(es>e*((S_INT)BASE_FIG)) { - return VpException(VP_EXCEPTION_INFINITY,"Exponent overflow",0); + return VpException(VP_EXCEPTION_INFINITY,"exponent overflow",0); } ++i; } diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/curses/curses.c ruby-1.8.2/ruby-1.8.2/ext/curses/curses.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/curses/curses.c 2004-12-15 01:57:05.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/ext/curses/curses.c 2005-02-26 15:45:24.843480360 -0800 @@ -124,7 +124,7 @@ if (rb_stdscr) return rb_stdscr; initscr(); if (stdscr 0) { - rb_raise(rb_eRuntimeError, "cannot initialize curses"); + rb_raise(rb_eRuntimeError, "can't initialize curses"); } clear(); rb_stdscr rep_window(cWindow, stdscr); diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/dl/handle.c ruby-1.8.2/ruby-1.8.2/ext/dl/handle.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/dl/handle.c 2003-11-13 03:46:31.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/ext/dl/handle.c 2005-02-26 15:46:49.069676032 -0800 @@ -161,7 +161,7 @@ Data_Get_Struct(self, struct dl_handle, dlhandle); if (!dlhandle->open) { - rb_raise(rb_eRuntimeError, "Closed handle."); + rb_raise(rb_eRuntimeError, "closed handle"); } handle lhandle->ptr; @@ -187,11 +187,11 @@ if (!func) #endif { - rb_raise(rb_eRuntimeError, "Unknown symbol \"%sA\".", name); + rb_raise(rb_eRuntimeError, "unknown symbol \"%sA\"", name); } } #else - rb_raise(rb_eRuntimeError, "Unknown symbol \"%s\".", name); + rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", name); #endif } val b_dlsym_new(func, name, stype); diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/openssl/ossl_cipher.c ruby-1.8.2/ruby-1.8.2/ext/openssl/ossl_cipher.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/openssl/ossl_cipher.c 2004-12-14 17:54:39.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/ext/openssl/ossl_cipher.c 2005-02-26 15:45:24.850479296 -0800 @@ -94,7 +94,7 @@ name tringValuePtr(str); GetCipher(self, ctx); if (!(cipher VP_get_cipherbyname(name))) { - ossl_raise(rb_eRuntimeError, "Unsupported cipher algorithm (%s).", name); + ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%s)", name); } if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) ! ) ossl_raise(eCipherError, NULL); @@ -198,7 +198,7 @@ if(!NIL_P(vsalt)){ StringValue(vsalt); if(RSTRING(vsalt)->len ! KCS5_SALT_LEN) - rb_raise(eCipherError, "salt must be an 8-octet string."); + rb_raise(eCipherError, "salt must be an 8-octet string"); salt STRING(vsalt)->ptr; } iter IL_P(viter) ? 2048 : NUM2INT(viter); diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/pty/pty.c ruby-1.8.2/ruby-1.8.2/ext/pty/pty.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/pty/pty.c 2003-12-10 18:39:59.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/ext/pty/pty.c 2005-02-26 15:45:24.850479296 -0800 @@ -375,7 +375,7 @@ } close(i); } - rb_raise(rb_eRuntimeError, "Cannot get Master/Slave device"); + rb_raise(rb_eRuntimeError, "can't get Master/Slave device"); #else char **p; char MasterName[DEVICELEN]; @@ -394,7 +394,7 @@ close(i); } } - rb_raise(rb_eRuntimeError, "Cannot get %s", SlaveName); + rb_raise(rb_eRuntimeError, "can't get %s", SlaveName); #endif } #endif /* HAVE__GETPTY */ diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/readline/readline.c ruby-1.8.2/ruby-1.8.2/ext/readline/readline.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/readline/readline.c 2004-12-03 10:36:23.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/ext/readline/readline.c 2005-02-26 15:45:24.851479144 -0800 @@ -487,7 +487,7 @@ i + tate->length; } if (i < 0 || i > state->length - 1) { - rb_raise(rb_eIndexError, "Invalid index"); + rb_raise(rb_eIndexError, "invalid index"); } return rb_tainted_str_new2(state->entries[i]->line); } @@ -509,7 +509,7 @@ i + tate->length; } if (i < 0 || i > state->length - 1) { - rb_raise(rb_eIndexError, "Invalid index"); + rb_raise(rb_eIndexError, "invalid index"); } SafeStringValue(str); replace_history_entry(i, RSTRING(str)->ptr, NULL); @@ -628,7 +628,7 @@ if (i < 0) i + tate->length; if (i < 0 || i > state->length - 1) { - rb_raise(rb_eIndexError, "Invalid index"); + rb_raise(rb_eIndexError, "invalid index"); } return rb_remove_history(i); } diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/socket/socket.c ruby-1.8.2/ruby-1.8.2/ext/socket/socket.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/socket/socket.c 2004-12-09 15:39:37.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/ext/socket/socket.c 2005-02-26 15:45:24.852478992 -0800 @@ -1536,7 +1536,7 @@ fd IX2INT(val); } else { - rb_raise(rb_eTypeError, "IO nor file descriptor"); + rb_raise(rb_eTypeError, "neither IO nor file descriptor"); } GetOpenFile(sock, fptr); @@ -1653,7 +1653,7 @@ msg.msg_accrightslen ! izeof(fd) #endif ) { - rb_raise(rb_eSocket, "File descriptor was not passed"); + rb_raise(rb_eSocket, "file descriptor was not passed"); } #if FD_PASSING_BY_MSG_CONTROL @@ -1803,7 +1803,7 @@ *dv F_IPX; #endif else - rb_raise(rb_eSocket, "Unknown socket domain %s", ptr); + rb_raise(rb_eSocket, "unknown socket domain %s", ptr); } else { *dv UM2INT(domain); @@ -1834,7 +1834,7 @@ *tv OCK_PACKET; #endif else - rb_raise(rb_eSocket, "Unknown socket type %s", ptr); + rb_raise(rb_eSocket, "unknown socket type %s", ptr); } else { *tv UM2INT(type); diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/strscan/strscan.c ruby-1.8.2/ruby-1.8.2/ext/strscan/strscan.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/strscan/strscan.c 2004-02-19 04:30:26.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/ext/strscan/strscan.c 2005-02-26 15:45:24.853478840 -0800 @@ -765,7 +765,7 @@ * s.unscan * s.scan(/../) # "te" * s.scan(/\d/) # nil - * s.unscan # ScanError: cannot unscan: prev match had failed + * s.unscan # ScanError: can't unscan: prev match had failed */ static VALUE strscan_peep(self, vlen) @@ -783,7 +783,7 @@ GET_SCANNER(self, p); if (! MATCHED_P(p)) - rb_raise(ScanError, "cannot unscan: prev match had failed"); + rb_raise(ScanError, "can't unscan: prev match had failed"); p->curr ->prev; CLEAR_MATCH_STATUS(p); diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/win32ole/win32ole.c ruby-1.8.2/ruby-1.8.2/ext/win32ole/win32ole.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/win32ole/win32ole.c 2004-10-30 08:33:00.000000000 -0700 +++ ruby-1.8.2/ruby-1.8.2/ext/win32ole/win32ole.c 2005-02-26 15:48:38.080103928 -0800 @@ -72,7 +72,7 @@ #define OLEData_Get_Struct(obj, pole) {\ Data_Get_Struct(obj, struct oledata, pole);\ if(!pole->pDispatch) {\ - rb_raise(rb_eRuntimeError, "Failed to get Dispatch Interface");\ + rb_raise(rb_eRuntimeError, "failed to get Dispatch Interface");\ }\ } @@ -603,7 +603,7 @@ if(gOLEInitialized Qfalse) { hr leInitialize(NULL); if(FAILED(hr)) { - ole_raise(hr, rb_eRuntimeError, "Fail: OLE initialize"); + ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize"); } gOLEInitialized true; /* @@ -1364,12 +1364,12 @@ if (!gole32) gole32 oadLibrary("OLE32"); if (!gole32) - rb_raise(rb_eRuntimeError, "Failed to load OLE32"); + rb_raise(rb_eRuntimeError, "failed to load OLE32"); if (!gCoCreateInstanceEx) gCoCreateInstanceEx FNCOCREATEINSTANCEEX*) GetProcAddress(gole32, "CoCreateInstanceEx"); if (!gCoCreateInstanceEx) - rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment."); + rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment"); rb_scan_args(argc, argv, "2*", &ole, &host, &others); pbuf le_mb2wc(StringValuePtr(ole), -1); @@ -1381,7 +1381,7 @@ SysFreeString(pbuf); if (FAILED(hr)) ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Unknown OLE server: `%s'", + "unknown OLE server: `%s'", StringValuePtr(ole)); memset(&serverinfo, 0, sizeof(COSERVERINFO)); serverinfo.pwszName le_mb2wc(StringValuePtr(host), -1); @@ -1391,7 +1391,7 @@ SysFreeString(serverinfo.pwszName); if (FAILED(hr)) ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Failed to create DCOM server `%s' in `%s'", + "failed to create DCOM server `%s' in `%s'", StringValuePtr(ole), StringValuePtr(host)); @@ -1418,7 +1418,7 @@ hr reateBindCtx(0, &pBindCtx); if(FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Failed to create bind context"); + "failed to create bind context"); } pbuf le_mb2wc(StringValuePtr(moniker), -1); @@ -1427,7 +1427,7 @@ if(FAILED(hr)) { OLE_RELEASE(pBindCtx); ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Failed to parse display name of moniker `%s'", + "failed to parse display name of moniker `%s'", StringValuePtr(moniker)); } hr Moniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL, @@ -1438,7 +1438,7 @@ if(FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Failed to bind moniker `%s'", + "failed to bind moniker `%s'", StringValuePtr(moniker)); } return create_win32ole_object(self, pDispatch, argc, argv); @@ -1495,7 +1495,7 @@ if(FAILED(hr)) { OLE_RELEASE(pUnknown); ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Failed to create WIN32OLE server `%s'", + "failed to create WIN32OLE server `%s'", StringValuePtr(svr_name)); } @@ -1532,19 +1532,19 @@ if (TYPE(klass) ! _CLASS && TYPE(klass) ! _MODULE && TYPE(klass) ! _NIL) { - rb_raise(rb_eTypeError, "2nd paramator must be Class or Module."); + rb_raise(rb_eTypeError, "2nd parameter must be Class or Module"); } if (rb_obj_is_kind_of(ole, cWIN32OLE)) { OLEData_Get_Struct(ole, pole); hr ole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch, 0, lcid, &pTypeInfo); if(FAILED(hr)) { - ole_raise(hr, rb_eRuntimeError, "Failed to GetTypeInfo"); + ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo"); } hr TypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index); if(FAILED(hr)) { OLE_RELEASE(pTypeInfo); - ole_raise(hr, rb_eRuntimeError, "Failed to GetContainingTypeLib"); + ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib"); } OLE_RELEASE(pTypeInfo); if(TYPE(klass) ! _NIL) { @@ -1564,7 +1564,7 @@ hr oadTypeLibEx(pBuf, REGKIND_NONE, &pTypeLib); SysFreeString(pBuf); if (FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to LoadTypeLibEx"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx"); if(TYPE(klass) ! _NIL) { ole_const_load(pTypeLib, klass, self); } @@ -1574,7 +1574,7 @@ OLE_RELEASE(pTypeLib); } else { - rb_raise(rb_eTypeError, "1st paramator must be WIN32OLE instance"); + rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE instance"); } return Qnil; } @@ -1720,11 +1720,11 @@ helpfile arget; } if (TYPE(helpfile) ! _STRING) { - rb_raise(rb_eTypeError, "1st parameter must be (String|WIN32OLE_TYPE|WIN32OLE_METHOD)."); + rb_raise(rb_eTypeError, "1st parameter must be (String|WIN32OLE_TYPE|WIN32OLE_METHOD)"); } hwnd le_show_help(helpfile, helpcontext); if(hwnd 0) { - rb_raise(rb_eRuntimeError, "Failed to open help file `%s'", + rb_raise(rb_eRuntimeError, "failed to open help file `%s'", StringValuePtr(helpfile)); } return Qnil; @@ -1769,7 +1769,7 @@ SysFreeString(pBuf); if(FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Unknown OLE server: `%s'", + "unknown OLE server: `%s'", StringValuePtr(svr_name)); } @@ -1778,7 +1778,7 @@ &IID_IDispatch, (void**)&pDispatch); if(FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Failed to create WIN32OLE object from `%s'", + "failed to create WIN32OLE object from `%s'", StringValuePtr(svr_name)); } @@ -1879,7 +1879,7 @@ rb_scan_args(argc, argv, "1*", &cmd, ¶mS); OLEData_Get_Struct(self, pole); if(!pole->pDispatch) { - rb_raise(rb_eRuntimeError, "Failed to get dispatch interface"); + rb_raise(rb_eRuntimeError, "failed to get dispatch interface"); } wcmdname le_mb2wc(StringValuePtr(cmd), -1); hr ole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL, @@ -1887,7 +1887,7 @@ SysFreeString(wcmdname); if(FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Unknown property or method `%s'", + "unknown property or method `%s'", StringValuePtr(cmd)); } @@ -1924,7 +1924,7 @@ VariantClear(&op.dp.rgvarg[i]); } ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Failed to get named argument info: `%s'", + "failed to get named argument info: `%s'", StringValuePtr(cmd)); } op.dp.rgdispidNamedArgs (pDispID[1]); @@ -2343,7 +2343,7 @@ if(FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Unknown property or method: `%s'", + "unknown property or method: `%s'", StringValuePtr(property)); } /* set property value */ @@ -2436,7 +2436,7 @@ if (FAILED(hr)) { VariantClear(&result); - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to get IEnum Interface"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to get IEnum Interface"); } if (V_VT(&result) VT_UNKNOWN) @@ -2449,7 +2449,7 @@ (void**)&pEnum); if (FAILED(hr) || !pEnum) { VariantClear(&result); - ole_raise(hr, rb_eRuntimeError, "Failed to get IEnum Interface"); + ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface"); } VariantClear(&result); @@ -2474,7 +2474,7 @@ id b_to_id(argv[0]); mname b_id2name(id); if(!mname) { - rb_raise(rb_eRuntimeError, "Fail: unknown method or property"); + rb_raise(rb_eRuntimeError, "fail: unknown method or property"); } n trlen(mname); if(mname[n-1] ' { @@ -2504,7 +2504,7 @@ VALUE method nil; hr LE_GET_TYPEATTR(pTypeInfo, &pTypeAttr); if (FAILED(hr)) { - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr"); } for(i ; i < pTypeAttr->cFuncs && method Qnil; i++) { hr TypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc); @@ -2543,7 +2543,7 @@ VALUE method nil; hr LE_GET_TYPEATTR(pTypeInfo, &pTypeAttr); if (FAILED(hr)) { - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr"); } method le_method_sub(self, 0, pTypeInfo, name); if (method ! nil) { @@ -2579,7 +2579,7 @@ WORD i; hr LE_GET_TYPEATTR(pTypeInfo, &pTypeAttr); if (FAILED(hr)) { - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr"); } for(i ; i < pTypeAttr->cFuncs; i++) { pstr ULL; @@ -2620,7 +2620,7 @@ VALUE methods b_ary_new(); hr LE_GET_TYPEATTR(pTypeInfo, &pTypeAttr); if (FAILED(hr)) { - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr"); } ole_methods_sub(0, pTypeInfo, methods, mask); @@ -2653,7 +2653,7 @@ HRESULT hr ole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch, 0, lcid, &pTypeInfo); if(FAILED(hr)) { - ole_raise(hr, rb_eRuntimeError, "Failed to GetTypeInfo"); + ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo"); } hr TypeInfo->lpVtbl->GetDocumentation(pTypeInfo, -1, @@ -2663,7 +2663,7 @@ hr TypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i); OLE_RELEASE(pTypeInfo); if (FAILED(hr)) { - ole_raise(hr, rb_eRuntimeError, "Failed to GetContainingTypeLib"); + ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib"); } count TypeLib->lpVtbl->GetTypeInfoCount(pTypeLib); for (i ; i < count; i++) { @@ -2772,12 +2772,12 @@ hr ole->pDispatch->lpVtbl->GetTypeInfo( pole->pDispatch, 0, lcid, &pTypeInfo ); if(FAILED(hr)) { - ole_raise(hr, rb_eRuntimeError, "Failed to GetTypeInfo"); + ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo"); } hr TypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index ); if(FAILED(hr)) { OLE_RELEASE(pTypeInfo); - ole_raise(hr, rb_eRuntimeError, "Failed to GetContainingTypeLib"); + ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib"); } hr TypeLib->lpVtbl->GetDocumentation( pTypeLib, index, &bstr, NULL, NULL, NULL); @@ -3010,12 +3010,12 @@ OLEData_Get_Struct(self, pole); hr ypeinfo_from_ole(pole, &pTypeInfo); if(FAILED(hr)) - ole_raise(hr, rb_eRuntimeError, "Failed to get ITypeInfo"); + ole_raise(hr, rb_eRuntimeError, "failed to get ITypeInfo"); method olemethod_s_allocate(cWIN32OLE_METHOD); obj lemethod_from_typeinfo(method, pTypeInfo, cmdname); OLE_RELEASE(pTypeInfo); if (obj Qnil) - rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found %s", + rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s", StringValuePtr(cmdname)); return obj; } @@ -3045,7 +3045,7 @@ pbuf le_mb2wc(StringValuePtr(file), -1); hr oadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib); if (FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to LoadTypeLibEx"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx"); SysFreeString(pbuf); ole_classes_from_typelib(pTypeLib, classes); OLE_RELEASE(pTypeLib); @@ -3220,11 +3220,11 @@ pbuf le_mb2wc(StringValuePtr(file), -1); hr oadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib); if (FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to LoadTypeLibEx"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx"); SysFreeString(pbuf); if (oleclass_from_typelib(self, pTypeLib, oleclass) Qfalse) { OLE_RELEASE(pTypeLib); - rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found `%s` in `%s`", + rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found `%s` in `%s`", StringValuePtr(oleclass), StringValuePtr(typelib)); } OLE_RELEASE(pTypeLib); @@ -3413,7 +3413,7 @@ HRESULT hr; hr LE_GET_TYPEATTR(pTypeInfo, &pTypeAttr); if (FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr"); ver NT2FIX(pTypeAttr->wMajorVerNum); OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr); return ver; @@ -3442,7 +3442,7 @@ HRESULT hr; hr LE_GET_TYPEATTR(pTypeInfo, &pTypeAttr); if (FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr"); ver NT2FIX(pTypeAttr->wMinorVerNum); OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr); return ver; @@ -3471,7 +3471,7 @@ HRESULT hr; hr LE_GET_TYPEATTR(pTypeInfo, &pTypeAttr); if (FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr"); typekind NT2FIX(pTypeAttr->typekind); OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr); return typekind; @@ -3621,7 +3621,7 @@ VALUE variables b_ary_new(); hr LE_GET_TYPEATTR(pTypeInfo, &pTypeAttr); if (FAILED(hr)) { - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr"); } for(i ; i < pTypeAttr->cVars; i++) { @@ -3701,7 +3701,7 @@ VALUE type; hr TypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc); if (FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetVarDesc"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc"); type le_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), Qnil); pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc); return type; @@ -3730,7 +3730,7 @@ VALUE type b_ary_new(); hr TypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc); if (FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetVarDesc"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc"); ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), type); pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc); return type; @@ -3936,12 +3936,12 @@ Data_Get_Struct(oletype, struct oletypedata, ptype); obj lemethod_from_typeinfo(self, ptype->pTypeInfo, method); if (obj Qnil) { - rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found %s", + rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s", StringValuePtr(method)); } } else { - rb_raise(rb_eTypeError, "1st argument should be WIN32OLE_TYPE object."); + rb_raise(rb_eTypeError, "1st argument should be WIN32OLE_TYPE object"); } return obj; } @@ -3969,7 +3969,7 @@ hr TypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc); if (FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetFuncDesc"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc"); type le_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil); pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc); @@ -4001,7 +4001,7 @@ hr TypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc); if (FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetFuncDesc"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc"); vt NT2FIX(pFuncDesc->elemdescFunc.tdesc.vt); pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc); @@ -4065,7 +4065,7 @@ VALUE invkind; hr TypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc); if(FAILED(hr)) - ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetFuncDesc"); + ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc"); invkind NT2FIX(pFuncDesc->invkind); pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc); return invkind; @@ -5267,7 +5267,7 @@ rb_scan_args(argc, argv, "11", &ole, &itf); if (!rb_obj_is_kind_of(ole, cWIN32OLE)) { - rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE object."); + rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE object"); } if(TYPE(itf) ! _NIL) { @@ -5294,7 +5294,7 @@ if (FAILED(hr)) { OLE_RELEASE(pTypeInfo); ole_raise(hr, rb_eRuntimeError, - "Failed to query IConnectionPointContainer"); + "failed to query IConnectionPointContainer"); } hr Container->lpVtbl->FindConnectionPoint(pContainer, @@ -5303,7 +5303,7 @@ OLE_RELEASE(pContainer); if (FAILED(hr)) { OLE_RELEASE(pTypeInfo); - ole_raise(hr, rb_eRuntimeError, "Failed to query IConnectionPoint"); + ole_raise(hr, rb_eRuntimeError, "failed to query IConnectionPoint"); } pIEV VENTSINK_Constructor(); pIEV->m_iid id; diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ext/zlib/zlib.c ruby-1.8.2/ruby-1.8.2/ext/zlib/zlib.c --- ruby-1.8.2.orig/ruby-1.8.2/ext/zlib/zlib.c 2004-12-17 23:37:01.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/ext/zlib/zlib.c 2005-02-26 15:45:24.866476864 -0800 @@ -2976,7 +2976,7 @@ VALUE dst; dst b_gzreader_getc(obj); if (NIL_P(dst)) { - rb_raise(rb_eEOFError, "End of file reached"); + rb_raise(rb_eEOFError, "end of file reached"); } return dst; } @@ -3158,7 +3158,7 @@ VALUE dst; dst b_gzreader_gets(argc, argv, obj); if (NIL_P(dst)) { - rb_raise(rb_eEOFError, "End of file reached"); + rb_raise(rb_eEOFError, "end of file reached"); } return dst; } diff -uNr ruby-1.8.2.orig/ruby-1.8.2/hash.c ruby-1.8.2/ruby-1.8.2/hash.c --- ruby-1.8.2.orig/ruby-1.8.2/hash.c 2004-12-17 18:07:29.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/hash.c 2005-02-26 15:45:24.829482488 -0800 @@ -1891,7 +1891,7 @@ char *name, *value; if (rb_safe_level() > ) { - rb_raise(rb_eSecurityError, "cannot change environment variable"); + rb_raise(rb_eSecurityError, "can't change environment variable"); } if (NIL_P(val)) { diff -uNr ruby-1.8.2.orig/ruby-1.8.2/io.c ruby-1.8.2/ruby-1.8.2/io.c --- ruby-1.8.2.orig/ruby-1.8.2/io.c 2004-12-25 02:56:39.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/io.c 2005-02-26 15:45:24.832482032 -0800 @@ -173,7 +173,7 @@ void rb_eof_error() { - rb_raise(rb_eEOFError, "End of file reached"); + rb_raise(rb_eEOFError, "end of file reached"); } VALUE @@ -2277,7 +2277,7 @@ } return MODE_BINMODE("r+", "rb+"); } - rb_raise(rb_eArgError, "illegal access mode %o", flags); + rb_raise(rb_eArgError, "illegal access modenum %o", flags); return NULL; /* not reached */ } diff -uNr ruby-1.8.2.orig/ruby-1.8.2/marshal.c ruby-1.8.2/ruby-1.8.2/marshal.c --- ruby-1.8.2.orig/ruby-1.8.2/marshal.c 2004-10-18 07:37:42.000000000 -0700 +++ ruby-1.8.2/ruby-1.8.2/marshal.c 2005-02-26 15:45:24.832482032 -0800 @@ -111,7 +111,7 @@ n); } if (rb_path2class(n) ! b_class_real(klass)) { - rb_raise(rb_eTypeError, "%s cannot be referred", n); + rb_raise(rb_eTypeError, "%s can't be referred", n); } return path; } @@ -615,7 +615,7 @@ } else if (FL_TEST(obj, FL_USER2)) { /* FL_USER2 means HASH_PROC_DEFAULT (see hash.c) */ - rb_raise(rb_eTypeError, "cannot dump hash with default proc"); + rb_raise(rb_eTypeError, "can't dump hash with default proc"); } else { w_byte(TYPE_HASH_DEF, arg); diff -uNr ruby-1.8.2.orig/ruby-1.8.2/numeric.c ruby-1.8.2/ruby-1.8.2/numeric.c --- ruby-1.8.2.orig/ruby-1.8.2/numeric.c 2004-11-17 19:47:14.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/numeric.c 2005-02-26 15:45:24.834481728 -0800 @@ -1437,7 +1437,7 @@ rb_raise(rb_eArgError, "wrong number of arguments"); } if (rb_equal(step, INT2FIX(0))) { - rb_raise(rb_eArgError, "step cannot be 0"); + rb_raise(rb_eArgError, "step can't be 0"); } } diff -uNr ruby-1.8.2.orig/ruby-1.8.2/object.c ruby-1.8.2/ruby-1.8.2/object.c --- ruby-1.8.2.orig/ruby-1.8.2/object.c 2004-12-17 18:07:28.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/object.c 2005-02-26 15:45:24.835481576 -0800 @@ -2041,7 +2041,7 @@ m b_intern(method); if (!rb_respond_to(val, m)) { if (raise) { - rb_raise(rb_eTypeError, "cannot convert %s into %s", + rb_raise(rb_eTypeError, "can't convert %s into %s", NIL_P(val) ? "nil" : val Qtrue ? "true" : val Qfalse ? "false" : @@ -2280,7 +2280,7 @@ return rb_float_new(rb_str_to_dbl(val, Qtrue)); case T_NIL: - rb_raise(rb_eTypeError, "cannot convert nil into Float"); + rb_raise(rb_eTypeError, "can't convert nil into Float"); break; default: diff -uNr ruby-1.8.2.orig/ruby-1.8.2/pack.c ruby-1.8.2/ruby-1.8.2/pack.c --- ruby-1.8.2.orig/ruby-1.8.2/pack.c 2004-11-16 11:43:24.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/pack.c 2005-02-26 15:45:24.836481424 -0800 @@ -343,7 +343,7 @@ if (TYPE(x) T_BIGNUM) { return rb_big2ulong_pack(x); } - rb_raise(rb_eTypeError, "cannot convert %s to `integer'", rb_obj_classname(x)); + rb_raise(rb_eTypeError, "can't convert %s to `integer'", rb_obj_classname(x)); return 0; /* not reached */ } @@ -962,7 +962,7 @@ { long l UM2LONG(from); if (l < 0) { - rb_raise(rb_eArgError, "cannot compress negative numbers"); + rb_raise(rb_eArgError, "can't compress negative numbers"); } ul ; } diff -uNr ruby-1.8.2.orig/ruby-1.8.2/process.c ruby-1.8.2/ruby-1.8.2/process.c --- ruby-1.8.2.orig/ruby-1.8.2/process.c 2004-12-23 06:36:53.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/process.c 2005-02-26 15:45:24.837481272 -0800 @@ -1817,7 +1817,7 @@ { rb_secure(2); if (under_uid_switch) { - rb_raise(rb_eRuntimeError, "can't handle UID during evaluating the block given to the Process::UID.switch method"); + rb_raise(rb_eRuntimeError, "can't handle UID while evaluating block given to Process::UID.switch method"); } } @@ -1827,7 +1827,7 @@ { rb_secure(2); if (under_gid_switch) { - rb_raise(rb_eRuntimeError, "can't handle GID during evaluating the block given to the Process::UID.switch method"); + rb_raise(rb_eRuntimeError, "can't handle GID while evaluating block given to Process::UID.switch method"); } } diff -uNr ruby-1.8.2.orig/ruby-1.8.2/range.c ruby-1.8.2/ruby-1.8.2/range.c --- ruby-1.8.2.orig/ruby-1.8.2/range.c 2004-10-19 03:25:20.000000000 -0700 +++ ruby-1.8.2/ruby-1.8.2/range.c 2005-02-26 15:45:24.838481120 -0800 @@ -352,7 +352,7 @@ if (unit 0) rb_raise(rb_eArgError, "step can't be 0"); if (!rb_respond_to(b, id_succ)) { - rb_raise(rb_eTypeError, "cannot iterate from %s", + rb_raise(rb_eTypeError, "can't iterate from %s", rb_obj_classname(b)); } @@ -400,7 +400,7 @@ end b_ivar_get(range, id_end); if (!rb_respond_to(beg, id_succ)) { - rb_raise(rb_eTypeError, "cannot iterate from %s", + rb_raise(rb_eTypeError, "can't iterate from %s", rb_obj_classname(beg)); } if (FIXNUM_P(beg) && FIXNUM_P(end)) { /* fixnums are special */ diff -uNr ruby-1.8.2.orig/ruby-1.8.2/ruby.c ruby-1.8.2/ruby-1.8.2/ruby.c --- ruby-1.8.2.orig/ruby-1.8.2/ruby.c 2004-07-23 00:52:38.000000000 -0700 +++ ruby-1.8.2/ruby-1.8.2/ruby.c 2005-02-26 15:45:24.838481120 -0800 @@ -715,7 +715,7 @@ } if (!*s) break; if (!strchr("IdvwrK", *s)) - rb_raise(rb_eRuntimeError, "Illegal switch in RUBYOPT: -%c", *s); + rb_raise(rb_eRuntimeError, "illegal switch in RUBYOPT: -%c", *s); s oreswitches(s); } } @@ -842,7 +842,7 @@ } } } - rb_raise(rb_eLoadError, "No Ruby script found in input"); + rb_raise(rb_eLoadError, "no Ruby script found in input"); } c b_io_getc(f); @@ -1035,11 +1035,11 @@ const char *s; { if (euid ! id) - rb_raise(rb_eSecurityError, "No %s allowed while running setuid", s); + rb_raise(rb_eSecurityError, "no %s allowed while running setuid", s); if (egid ! id) - rb_raise(rb_eSecurityError, "No %s allowed while running setgid", s); + rb_raise(rb_eSecurityError, "no %s allowed while running setgid", s); if (rb_safe_level() > 0) - rb_raise(rb_eSecurityError, "No %s allowed in tainted mode", s); + rb_raise(rb_eSecurityError, "no %s allowed in tainted mode", s); } static void diff -uNr ruby-1.8.2.orig/ruby-1.8.2/signal.c ruby-1.8.2/ruby-1.8.2/signal.c --- ruby-1.8.2.orig/ruby-1.8.2/signal.c 2004-06-28 18:31:37.000000000 -0700 +++ ruby-1.8.2/ruby-1.8.2/signal.c 2005-02-26 15:45:24.839480968 -0800 @@ -582,7 +582,7 @@ } #if defined(HAVE_SETITIMER) if (sig SIGVTALRM) { - rb_raise(rb_eArgError, "SIGVTALRM reserved for Thread; cannot set handler"); + rb_raise(rb_eArgError, "SIGVTALRM reserved for Thread; can't set handler"); } #endif if (func SIG_DFL) { diff -uNr ruby-1.8.2.orig/ruby-1.8.2/sprintf.c ruby-1.8.2/ruby-1.8.2/sprintf.c --- ruby-1.8.2.orig/ruby-1.8.2/sprintf.c 2004-12-07 22:22:51.000000000 -0800 +++ ruby-1.8.2/ruby-1.8.2/sprintf.c 2005-02-26 15:45:24.840480816 -0800 @@ -107,7 +107,7 @@ (posarg 1, GETNTHARG(n)))) #define GETNTHARG(nth) \ - ((nth > rgc) ? (rb_raise(rb_eArgError, "too few arguments."), 0) : argv[nth]) + ((nth > rgc) ? (rb_raise(rb_eArgError, "too few arguments"), 0) : argv[nth]) #define GETASTER(val) do { \ t ++; \ --PGNNI9BzQDUtgA2J--