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 | 42f00af5e303eae62bf88fd36628da89728c67d7 (patch) | |
tree | c9c53ad1559e7ebe79956303b9aaa2d5cb2dd663 /ext | |
parent | 65e0e64656f24488e1a17cd91a3a3de02ee27a78 (diff) |
* ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
CR and LF. (doesn't depend on CR+LF) [ruby-dev:23694]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/win32ole/win32ole.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index f856cd2516..0e9c53f016 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); |