diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-22 15:21:03 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-22 15:21:03 +0000 |
| commit | 2bb049097050da8846ddb66d519cd6909a6c8f8c (patch) | |
| tree | db13207eea3b857d9b6f7f4625c994d25aeb32ef | |
| parent | 2426b682ea8154f4ebb1f60a02b7dfd6bd593062 (diff) | |
| download | ruby-2bb049097050da8846ddb66d519cd6909a6c8f8c.tar.gz ruby-2bb049097050da8846ddb66d519cd6909a6c8f8c.tar.xz ruby-2bb049097050da8846ddb66d519cd6909a6c8f8c.zip | |
* ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
CR and LF. (doesn't depend on CR+LF) [ruby-dev:23694]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 9 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Jun 23 00:20:20 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing + CR and LF. (doesn't depend on CR+LF) [ruby-dev:23694] + Wed Jun 23 00:00:25 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (rb_io_initialize): should check fcntl result. [ruby-dev:23742] diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 6ca066803..a24023f34 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -501,9 +501,12 @@ ole_hresult2msg(hr) NULL, hr, LOCALE_SYSTEM_DEFAULT, (LPTSTR)&p_msg, 0, NULL); if (dwCount > 0) { - term = strrchr(p_msg, '\r'); - if (term) { - *term = '\0'; + term = p_msg + strlen(p_msg); + while (p_msg < term) { + term--; + if (*term == '\r' || *term == '\n') + *term = '\0'; + else break; } if (p_msg[0] != '\0') { rb_str_cat2(msg, p_msg); |