darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pack

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13818 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2011-12-18 20:11:34 +00:00
parent f1c9b988cb
commit d9f155ee4b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camlibs/ptp2/ptp-pack.c
View File

@@ -163,8 +163,9 @@ ptp_pack_string(PTPParams *params, char *string, unsigned char* data, uint16_t o
/* Cannot exceed 255 (PTP_MAXSTRLEN) since it is a single byte, duh ... */
memset(ucs2strp, 0, sizeof(ucs2str)); /* XXX: necessary? */
/*ptp_debug (params ,"pack_string of %s", string);*/
#ifdef HAVE_ICONV
if (params->cd_locale_to_ucs2 == (iconv_t)-1) {
if (params->cd_locale_to_ucs2 != (iconv_t)-1) {
size_t nconv;
size_t convmax = PTP_MAXSTRLEN * 2; /* Includes the terminator */
char *stringp = string;
@@ -174,7 +175,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++) {
@@ -182,7 +183,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()?