--- src/ptp.c.str 2009-01-07 22:58:09.000000000 +0100 +++ src/ptp.c 2009-01-07 22:59:20.000000000 +0100 @@ -4148,7 +4148,7 @@ if (!(ofc & 0x8000)) { for (i=0;i<sizeof(ptp_ofc_trans)/sizeof(ptp_ofc_trans[0]);i++) if (ofc == ptp_ofc_trans[i].ofc) - return snprintf(txt, spaceleft,_(ptp_ofc_trans[i].format)); + return snprintf(txt, spaceleft,"%s",_(ptp_ofc_trans[i].format)); } else { switch (params->deviceinfo.VendorExtensionID) { case PTP_VENDOR_EASTMAN_KODAK: @@ -4170,7 +4170,7 @@ case PTP_VENDOR_MICROSOFT: for (i=0;i<sizeof(ptp_ofc_mtp_trans)/sizeof(ptp_ofc_mtp_trans[0]);i++) if (ofc == ptp_ofc_mtp_trans[i].ofc) - return snprintf(txt, spaceleft,_(ptp_ofc_mtp_trans[i].format)); + return snprintf(txt, spaceleft,"%s",_(ptp_ofc_mtp_trans[i].format)); break; default:break; } @@ -4281,13 +4281,13 @@ if (!(opcode & 0x8000)) { for (i=0;i<sizeof(ptp_opcode_trans)/sizeof(ptp_opcode_trans[0]);i++) if (opcode == ptp_opcode_trans[i].opcode) - return snprintf(txt, spaceleft,_(ptp_opcode_trans[i].name)); + return snprintf(txt, spaceleft,"%s",_(ptp_opcode_trans[i].name)); } else { switch (params->deviceinfo.VendorExtensionID) { case PTP_VENDOR_MICROSOFT: for (i=0;i<sizeof(ptp_opcode_mtp_trans)/sizeof(ptp_opcode_mtp_trans[0]);i++) if (opcode == ptp_opcode_mtp_trans[i].opcode) - return snprintf(txt, spaceleft,_(ptp_opcode_mtp_trans[i].name)); + return snprintf(txt, spaceleft,"%s",_(ptp_opcode_mtp_trans[i].name)); break; default:break; } @@ -4475,7 +4475,7 @@ int i; for (i=0;i<sizeof(ptp_opc_trans)/sizeof(ptp_opc_trans[0]);i++) if (propid == ptp_opc_trans[i].id) - return snprintf(txt, spaceleft,ptp_opc_trans[i].name); + return snprintf(txt, spaceleft,"%s",ptp_opc_trans[i].name); return snprintf (txt, spaceleft,"unknown(%04x)", propid); }