Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 118161 | Differences between
and this patch

Collapse All | Expand All

(-)libptp2-1.1.0.orig/src/ptp-pack.c (-5 / +5 lines)
Lines 440-446 Link Here
440
		case PTP_DTC_STR:
440
		case PTP_DTC_STR:
441
		{
441
		{
442
			uint8_t len;
442
			uint8_t len;
443
			(char *)(*value)=ptp_unpack_string(params,data,0,&len);
443
			(*value)=(char *)ptp_unpack_string(params,data,0,&len);
444
			break;
444
			break;
445
		}
445
		}
446
	}
446
	}
Lines 513-522 Link Here
513
		/* XXX: other int types are unimplemented */
513
		/* XXX: other int types are unimplemented */
514
		/* XXX: int arrays are unimplemented also */
514
		/* XXX: int arrays are unimplemented also */
515
		case PTP_DTC_STR:
515
		case PTP_DTC_STR:
516
			(char *)dpd->FactoryDefaultValue = ptp_unpack_string
516
			dpd->FactoryDefaultValue = (char *)ptp_unpack_string
517
				(params,data,PTP_dpd_FactoryDefaultValue,&len);
517
				(params,data,PTP_dpd_FactoryDefaultValue,&len);
518
			totallen=len*2+1;
518
			totallen=len*2+1;
519
			(char *)dpd->CurrentValue = ptp_unpack_string
519
			dpd->CurrentValue = (char *)ptp_unpack_string
520
				(params, data, PTP_dpd_FactoryDefaultValue + 
520
				(params, data, PTP_dpd_FactoryDefaultValue + 
521
				totallen, &len);
521
				totallen, &len);
522
			totallen+=len*2+1;
522
			totallen+=len*2+1;
Lines 598-605 Link Here
598
			int i;
598
			int i;
599
			for(i=0;i<N;i++)
599
			for(i=0;i<N;i++)
600
			{
600
			{
601
				(char *)dpd->FORM.Enum.SupportedValue[i]=
601
				dpd->FORM.Enum.SupportedValue[i]=
602
					ptp_unpack_string
602
					(char *)ptp_unpack_string
603
					(params,data,PTP_dpd_FactoryDefaultValue
603
					(params,data,PTP_dpd_FactoryDefaultValue
604
					+totallen,&len);
604
					+totallen,&len);
605
				totallen+=len*2+1;
605
				totallen+=len*2+1;

Return to bug 118161