diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2011-12-18 20:25:15 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2011-12-18 20:25:15 +0000 |
| commit | 6571110f36f261e9807cb0680098a8ab30a3d00f (patch) | |
| tree | ebe2a8654ca51f080647e4e5aa9381eed53bb034 | |
| parent | 09df87314e113e971a000873dabf367a0bb993e3 (diff) | |
| download | libgphoto2-6571110f36f261e9807cb0680098a8ab30a3d00f.tar.gz | |
fixed ptp string packgin
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@13820 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | camlibs/ptp2/ptp-pack.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index a7960703f..910be2cc8 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -177,7 +177,7 @@ ptp_pack_string(PTPParams *params, char *string, unsigned char* data, uint16_t o if (nconv == (size_t) -1) ucs2str[0] = 0x0000U; } else -#else +#endif { int i; for (i=0;i<convlen;i++) { @@ -185,7 +185,6 @@ ptp_pack_string(PTPParams *params, char *string, unsigned char* data, uint16_t o } ucs2str[convlen] = 0; } -#endif /* * XXX: isn't packedlen just ( (uint16_t *)ucs2strp - ucs2str )? * why do we need ucs2strlen()? |