diff options
| author | obo <obo@openoffice.org> | 2010-06-22 15:46:16 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-22 15:46:16 +0200 |
| commit | f32a2e368c3bb2d6955a4943944bb65df3ae8657 (patch) | |
| tree | bfc40d1c372227ba7c0ccdb15f0d22a502f1ed93 | |
| parent | 3d4c4439aa344a61d3d448b188261545fcc28e65 (diff) | |
| parent | ee1f20e21bef4ac163b0e191a00ebf42bca3c0f8 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes75
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 2 | ||||
| -rw-r--r-- | idlc/source/preproc/tokens.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 0e1df437b0e1..c80e20feb18a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -552,7 +552,7 @@ extern "C" void privateSnippetExecutor( ... ) "mr %0, 1\n\t" : "=r" (sp) : ); - volatile long nRegReturn[0]; + volatile long nRegReturn[1]; typelib_TypeClass aType = cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, sp, (sal_Int64*)nRegReturn); diff --git a/idlc/source/preproc/tokens.c b/idlc/source/preproc/tokens.c index 6df35ae1f238..23ab88a5a9e3 100644 --- a/idlc/source/preproc/tokens.c +++ b/idlc/source/preproc/tokens.c @@ -474,7 +474,8 @@ void if (wbp >= &wbuf[OBS]) { - write(1, wbuf, OBS); + if (write(1, wbuf, OBS) != OBS) + error(ERROR, "short write!"); if (wbp > &wbuf[OBS]) memcpy(wbuf, wbuf + OBS, wbp - &wbuf[OBS]); wbp -= OBS; @@ -490,7 +491,8 @@ void { if (wbp > wbuf) { - write(1, wbuf, wbp - wbuf); + if (write(1, wbuf, wbp - wbuf) != wbp - wbuf) + error(ERROR, "short write!"); wbp = wbuf; } } |