olympus-wrap.c (libgphoto2-2.5.26.tar.bz2) | : | olympus-wrap.c (libgphoto2-2.5.27.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 819 | skipping to change at line 819 | |||
ptp_debug( params, "enum"); | ptp_debug( params, "enum"); | |||
dpd->FormFlag = PTP_DPFF_Enumeration; | dpd->FormFlag = PTP_DPFF_Enumeration; | |||
s = (char*)xmlNodeGetContent (next); | s = (char*)xmlNodeGetContent (next); | |||
n = 0; | n = 0; | |||
do { | do { | |||
s = strchr(s,' '); | s = strchr(s,' '); | |||
if (s) s++; | if (s) s++; | |||
n++; | n++; | |||
} while (s); | } while (s); | |||
dpd->FORM.Enum.NumberOfValues = n; | dpd->FORM.Enum.NumberOfValues = n; | |||
dpd->FORM.Enum.SupportedValue = malloc (n * sizeof(PTPPro pertyValue)); | dpd->FORM.Enum.SupportedValue = calloc (n , sizeof(PTPPro pertyValue)); | |||
s = (char*)xmlNodeGetContent (next); | s = (char*)xmlNodeGetContent (next); | |||
i = 0; | i = 0; | |||
do { | do { | |||
parse_9301_value (params, s, type, &dpd->FORM.Enu m.SupportedValue[i]); /* should turn ' ' into \0? */ | parse_9301_value (params, s, type, &dpd->FORM.Enu m.SupportedValue[i]); /* should turn ' ' into \0? */ | |||
i++; | i++; | |||
s = strchr(s,' '); | s = strchr(s,' '); | |||
if (s) s++; | if (s) s++; | |||
} while (s && (i<n)); | } while (s && (i<n)); | |||
continue; | continue; | |||
} | } | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |