src/libmtp.c - Issue 2364793002: Revert "Uprev libmtp to 1.1.12"

Unified Diff: src/libmtp.c

Issue 2364793002: Revert "Uprev libmtp to 1.1.12" (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libmtp@master

Patch Set: Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/libmtp.c

diff --git a/src/libmtp.c b/src/libmtp.c

index c3df3f53ce3f852c908823ba808ff6dd0961ecee..b8f856b7bc393a4cc8870162cfdf19bcb44b5c1e 100644

--- a/src/libmtp.c

+++ b/src/libmtp.c

@@ -116,20 +116,11 @@ typedef struct propertymap_struct {

struct propertymap_struct *next;

} propertymap_t;

-/*

- * This is a simple container for holding our callback and user_data

- * for parsing onwards to the usb_event_async function.

- */

-typedef struct event_cb_data_struct {

- LIBMTP_event_cb_fn cb;

- void *user_data;

-} event_cb_data_t;

// Global variables

// This holds the global filetype mapping table

-static filemap_t *g_filemap = NULL;

+static filemap_t *filemap = NULL;

// This holds the global property mapping table

-static propertymap_t *g_propertymap = NULL;

+static propertymap_t *propertymap = NULL;

* Forward declarations of local (static) functions.

@@ -153,8 +144,7 @@ static void get_handles_recursively(LIBMTP_mtpdevice_t *device,

uint32_t parent);

static void free_storage_list(LIBMTP_mtpdevice_t *device);

static int sort_storage_by(LIBMTP_mtpdevice_t *device, int const sortby);

-static uint32_t get_writeable_storageid(LIBMTP_mtpdevice_t *device,

- uint64_t fitsize);

+static uint32_t get_writeable_storageid(LIBMTP_mtpdevice_t *device, uint64_t fitsize);

static int get_storage_freespace(LIBMTP_mtpdevice_t *device,

LIBMTP_devicestorage_t *storage,

uint64_t *freespace);

@@ -221,8 +211,6 @@ static int set_object_filename(LIBMTP_mtpdevice_t *device,

const char **newname);

static char *generate_unique_filename(PTPParams* params, char const * const filename);

static int check_filename_exists(PTPParams* params, char const * const filename);

-static void LIBMTP_Handle_Event(PTPContainer *ptp_event,

- LIBMTP_event_t *event, uint32_t *out1);

/**

* These are to wrap the get/put handlers to convert from the MTP types to PTP types

@@ -235,7 +223,7 @@ typedef struct _MTPDataHandler {

} MTPDataHandler;

static uint16_t get_func_wrapper(PTPParams* params, void* priv, unsigned long wantlen, unsigned char *data, unsigned long *gotlen);

-static uint16_t put_func_wrapper(PTPParams* params, void* priv, unsigned long sendlen, unsigned char *data);

+static uint16_t put_func_wrapper(PTPParams* params, void* priv, unsigned long sendlen, unsigned char *data, unsigned long *putlen);

/**

* Checks if a filename ends with ".ogg". Used in various

@@ -317,7 +305,7 @@ static int register_filetype(char const * const description, LIBMTP_filetype_t c

filemap_t *new = NULL, *current;

// Has this LIBMTP filetype been registered before ?

- current = g_filemap;

+ current = filemap;

while (current != NULL) {

if(current->id == id) {

break;

@@ -339,10 +327,10 @@ static int register_filetype(char const * const description, LIBMTP_filetype_t c

new->ptp_id = ptp_id;

// Add the entry to the list

- if(g_filemap == NULL) {

- g_filemap = new;

+ if(filemap == NULL) {

+ filemap = new;

} else {

- current = g_filemap;

+ current = filemap;

while (current->next != NULL ) current=current->next;

current->next = new;

}

@@ -419,7 +407,7 @@ static uint16_t map_libmtp_type_to_ptp_type(LIBMTP_filetype_t intype)

{

filemap_t *current;

- current = g_filemap;

+ current = filemap;

while (current != NULL) {

if(current->id == intype) {

@@ -442,7 +430,7 @@ static LIBMTP_filetype_t map_ptp_type_to_libmtp_type(uint16_t intype)

{

filemap_t *current;

- current = g_filemap;

+ current = filemap;

while (current != NULL) {

if(current->ptp_id == intype) {

@@ -488,7 +476,7 @@ static int register_property(char const * const description, LIBMTP_property_t c

propertymap_t *new = NULL, *current;

// Has this LIBMTP propety been registered before ?

- current = g_propertymap;

+ current = propertymap;

while (current != NULL) {

if(current->id == id) {

break;

@@ -510,10 +498,10 @@ static int register_property(char const * const description, LIBMTP_property_t c

new->ptp_id = ptp_id;

// Add the entry to the list

- if(g_propertymap == NULL) {

- g_propertymap = new;

+ if(propertymap == NULL) {

+ propertymap = new;

} else {

- current = g_propertymap;

+ current = propertymap;

while (current->next != NULL ) current=current->next;

current->next = new;

}

@@ -713,7 +701,7 @@ static uint16_t map_libmtp_property_to_ptp_property(LIBMTP_property_t inproperty

{

propertymap_t *current;

- current = g_propertymap;

+ current = propertymap;

while (current != NULL) {

if(current->id == inproperty) {

@@ -735,7 +723,7 @@ static LIBMTP_property_t map_ptp_property_to_libmtp_property(uint16_t inproperty

{

propertymap_t *current;

- current = g_propertymap;

+ current = propertymap;

while (current != NULL) {

if(current->ptp_id == inproperty) {

@@ -808,7 +796,7 @@ char const * LIBMTP_Get_Filetype_Description(LIBMTP_filetype_t intype)

{

filemap_t *current;

- current = g_filemap;

+ current = filemap;

while (current != NULL) {

if(current->id == intype) {

@@ -831,7 +819,7 @@ char const * LIBMTP_Get_Property_Description(LIBMTP_property_t inproperty)

{

propertymap_t *current;

- current = g_propertymap;

+ current = propertymap;

while (current != NULL) {

if(current->id == inproperty) {

@@ -1340,14 +1328,13 @@ static char *get_string_from_object(LIBMTP_mtpdevice_t *device, uint32_t const o

{

PTPPropertyValue propval;

char *retstring = NULL;

- PTPParams *params;

+ PTPParams *params = (PTPParams *) device->params;

uint16_t ret;

MTPProperties *prop;

- if (!device || !object_id)

+ if ( device == NULL || object_id == 0) {

return NULL;

- params = (PTPParams *) device->params;

+ }

prop = ptp_find_object_prop_in_cache(params, object_id, attribute_id);

if (prop) {

@@ -1384,14 +1371,13 @@ static uint64_t get_u64_from_object(LIBMTP_mtpdevice_t *device,uint32_t const ob

{

PTPPropertyValue propval;

uint64_t retval = value_default;

- PTPParams *params;

+ PTPParams *params = (PTPParams *) device->params;

uint16_t ret;

MTPProperties *prop;

- if (!device)

+ if ( device == NULL ) {

return value_default;

- params = (PTPParams *) device->params;

+ }

prop = ptp_find_object_prop_in_cache(params, object_id, attribute_id);

if (prop)

@@ -1424,14 +1410,13 @@ static uint32_t get_u32_from_object(LIBMTP_mtpdevice_t *device,uint32_t const ob

{

PTPPropertyValue propval;

uint32_t retval = value_default;

- PTPParams *params;

+ PTPParams *params = (PTPParams *) device->params;

uint16_t ret;

MTPProperties *prop;

- if (!device)

+ if ( device == NULL ) {

return value_default;

- params = (PTPParams *) device->params;

+ }

prop = ptp_find_object_prop_in_cache(params, object_id, attribute_id);

if (prop)

@@ -1463,14 +1448,13 @@ static uint16_t get_u16_from_object(LIBMTP_mtpdevice_t *device, uint32_t const o

{

PTPPropertyValue propval;

uint16_t retval = value_default;

- PTPParams *params;

+ PTPParams *params = (PTPParams *) device->params;

uint16_t ret;

MTPProperties *prop;

- if (!device)

+ if ( device == NULL ) {

return value_default;

- params = (PTPParams *) device->params;

+ }

// This O(n) search should not be used so often, since code

// using the cached properties don't usually call this function.

@@ -1505,14 +1489,13 @@ static uint8_t get_u8_from_object(LIBMTP_mtpdevice_t *device, uint32_t const obj

{

PTPPropertyValue propval;

uint8_t retval = value_default;

- PTPParams *params;

+ PTPParams *params = (PTPParams *) device->params;

uint16_t ret;

MTPProperties *prop;

- if (!device)

+ if ( device == NULL ) {

return value_default;

- params = (PTPParams *) device->params;

+ }

// This O(n) search should not be used so often, since code

// using the cached properties don't usually call this function.

@@ -1546,13 +1529,12 @@ static int set_object_string(LIBMTP_mtpdevice_t *device, uint32_t const object_i

uint16_t const attribute_id, char const * const string)

{

PTPPropertyValue propval;

- PTPParams *params;

+ PTPParams *params = (PTPParams *) device->params;

uint16_t ret;

- if (!device || !string)

+ if (device == NULL || string == NULL) {

return -1;

- params = (PTPParams *) device->params;

+ }

if (!ptp_operation_issupported(params,PTP_OC_MTP_SetObjectPropValue)) {

add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL, "set_object_string(): could not set object string: "

@@ -1583,13 +1565,12 @@ static int set_object_u32(LIBMTP_mtpdevice_t *device, uint32_t const object_id,

uint16_t const attribute_id, uint32_t const value)

{

PTPPropertyValue propval;

- PTPParams *params;

+ PTPParams *params = (PTPParams *) device->params;

uint16_t ret;

- if (!device)

+ if (device == NULL) {

return -1;

- params = (PTPParams *) device->params;

+ }

if (!ptp_operation_issupported(params,PTP_OC_MTP_SetObjectPropValue)) {

add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL, "set_object_u32(): could not set unsigned 32bit integer property: "

@@ -1620,13 +1601,12 @@ static int set_object_u16(LIBMTP_mtpdevice_t *device, uint32_t const object_id,

uint16_t const attribute_id, uint16_t const value)

{

PTPPropertyValue propval;

- PTPParams *params;

+ PTPParams *params = (PTPParams *) device->params;

uint16_t ret;

- if (!device)

+ if (device == NULL) {

return 1;

- params = (PTPParams *) device->params;

+ }

if (!ptp_operation_issupported(params,PTP_OC_MTP_SetObjectPropValue)) {

add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL, "set_object_u16(): could not set unsigned 16bit integer property: "

@@ -1656,13 +1636,12 @@ static int set_object_u8(LIBMTP_mtpdevice_t *device, uint32_t const object_id,

uint16_t const attribute_id, uint8_t const value)

{

PTPPropertyValue propval;

- PTPParams *params;

+ PTPParams *params = (PTPParams *) device->params;

uint16_t ret;

- if (!device)

+ if (device == NULL) {

return 1;

- params = (PTPParams *) device->params;

+ }

if (!ptp_operation_issupported(params,PTP_OC_MTP_SetObjectPropValue)) {

add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL, "set_object_u8(): could not set unsigned 8bit integer property: "

@@ -1697,7 +1676,6 @@ LIBMTP_mtpdevice_t *LIBMTP_Get_First_Device(void)

}

if (devices == NULL || numdevs == 0) {

- free(devices);

return NULL;

}

@@ -1768,12 +1746,12 @@ static void parse_extension_descriptor(LIBMTP_mtpdevice_t *mtpdevice,

/* descriptors are divided by semicolons */

while (end < strlen(desc)) {

/* Skip past initial whitespace */

- while ((end < strlen(desc)) && (desc[start] == ' ' )) {

+ while (desc[start] == ' ' && end < strlen(desc)) {

start++;

end++;

}

/* Detect extension */

- while ((end < strlen(desc)) && (desc[end] != ';'))

+ while (desc[end] != ';' && end < strlen(desc))

end++;

if (end < strlen(desc)) {

char *element = strndup(desc + start, end-start);

@@ -1782,7 +1760,7 @@ static void parse_extension_descriptor(LIBMTP_mtpdevice_t *mtpdevice,

// printf(" Element: \"%s\"\n", element);

/* Parse for an extension */

- while ((i < strlen(element)) && (element[i] != ':'))

+ while (element[i] != ':' && i < strlen(element))

i++;

if (i < strlen(element)) {

char *name = strndup(element, i);

@@ -1790,7 +1768,7 @@ static void parse_extension_descriptor(LIBMTP_mtpdevice_t *mtpdevice,

// printf(" Extension: \"%s\"\n", name);

/* Parse for minor/major punctuation mark for this extension */

- while ((i < strlen(element)) && (element[i] != '.'))

+ while (element[i] != '.' && i < strlen(element))

i++;

if (i > majstart && i < strlen(element)) {

LIBMTP_device_extension_t *extension;

@@ -1800,8 +1778,6 @@ static void parse_extension_descriptor(LIBMTP_mtpdevice_t *mtpdevice,

char *minorstr = strndup(element + i + 1, strlen(element) - i - 1);

major = atoi(majorstr);

minor = atoi(minorstr);

- // printf(" Major: \"%s\" (parsed %d) Minor: \"%s\" (parsed %d)\n",

- // majorstr, major, minorstr, minor);

free(majorstr);

free(minorstr);

extension = malloc(sizeof(LIBMTP_device_extension_t));

@@ -1817,6 +1793,8 @@ static void parse_extension_descriptor(LIBMTP_mtpdevice_t *mtpdevice,

tmp = tmp->next;

tmp->next = extension;

}

+ // printf(" Major: \"%s\" (parsed %d) Minor: \"%s\" (parsed %d)\n",

+ // majorstr, major, minorstr, minor);

} else {

LIBMTP_ERROR("LIBMTP ERROR: couldnt parse extension %s\n",

element);

@@ -1849,6 +1827,7 @@ LIBMTP_mtpdevice_t *LIBMTP_Open_Raw_Device_Uncached(LIBMTP_raw_device_t *rawdevi

/* Allocate dynamic space for our device */

mtp_device = (LIBMTP_mtpdevice_t *) malloc(sizeof(LIBMTP_mtpdevice_t));

+ memset(mtp_device, 0, sizeof(LIBMTP_mtpdevice_t));

/* Check if there was a memory allocation error */

if(mtp_device == NULL) {

/* There has been an memory allocation error. We are going to ignore this

@@ -1861,7 +1840,6 @@ LIBMTP_mtpdevice_t *LIBMTP_Open_Raw_Device_Uncached(LIBMTP_raw_device_t *rawdevi

return NULL;

}

- memset(mtp_device, 0, sizeof(LIBMTP_mtpdevice_t));

// Non-cached by default

mtp_device->cached = 0;

@@ -2175,27 +2153,27 @@ int LIBMTP_Read_Event(LIBMTP_mtpdevice_t *device, LIBMTP_event_t *event, uint32_

PTPParams *params = (PTPParams *) device->params;

PTPContainer ptp_event;

uint16_t ret = ptp_usb_event_wait(params, &ptp_event);

+ uint16_t code;

+ uint32_t session_id;

+ uint32_t transaction_id;

+ uint32_t param1;

+ uint32_t param2;

+ uint32_t param3;

if (ret != PTP_RC_OK) {

/* Device is closing down or other fatal stuff, exit thread */

return -1;

}

- LIBMTP_Handle_Event(&ptp_event, event, out1);

- return 0;

-void LIBMTP_Handle_Event(PTPContainer *ptp_event,

- LIBMTP_event_t *event, uint32_t *out1) {

- uint16_t code;

- uint32_t session_id;

- uint32_t param1;

*event = LIBMTP_EVENT_NONE;

/* Process the event */

- code = ptp_event->Code;

- session_id = ptp_event->SessionID;

- param1 = ptp_event->Param1;

+ code = ptp_event.Code;

+ session_id = ptp_event.SessionID;

+ transaction_id = ptp_event.Transaction_ID;

+ param1 = ptp_event.Param1;

+ param2 = ptp_event.Param2;

+ param3 = ptp_event.Param3;

switch(code) {

case PTP_EC_Undefined:

@@ -2206,13 +2184,9 @@ void LIBMTP_Handle_Event(PTPContainer *ptp_event,

break;

case PTP_EC_ObjectAdded:

LIBMTP_INFO("Received event PTP_EC_ObjectAdded in session %u\n", session_id);

- *event = LIBMTP_EVENT_OBJECT_ADDED;

- *out1 = param1;

break;

case PTP_EC_ObjectRemoved:

LIBMTP_INFO("Received event PTP_EC_ObjectRemoved in session %u\n", session_id);

- *event = LIBMTP_EVENT_OBJECT_REMOVED;

- *out1 = param1;

break;

case PTP_EC_StoreAdded:

LIBMTP_INFO("Received event PTP_EC_StoreAdded in session %u\n", session_id);

@@ -2223,8 +2197,6 @@ void LIBMTP_Handle_Event(PTPContainer *ptp_event,

case PTP_EC_StoreRemoved:

LIBMTP_INFO("Received event PTP_EC_StoreRemoved in session %u\n", session_id);

/* TODO: rescan storages */

- *event = LIBMTP_EVENT_STORE_REMOVED;

- *out1 = param1;

break;

case PTP_EC_DevicePropChanged:

LIBMTP_INFO("Received event PTP_EC_DevicePropChanged in session %u\n", session_id);

@@ -2261,60 +2233,8 @@ void LIBMTP_Handle_Event(PTPContainer *ptp_event,

LIBMTP_INFO( "Received unknown event in session %u\n", session_id);

break;

}

-static void LIBMTP_Read_Event_Cb(PTPParams *params, uint16_t ret_code,

- PTPContainer *ptp_event, void *user_data) {

- event_cb_data_t *data = user_data;

- LIBMTP_event_t event = LIBMTP_EVENT_NONE;

- uint32_t param1 = 0;

- int handler_ret;

- switch (ret_code) {

- case PTP_RC_OK:

- handler_ret = LIBMTP_HANDLER_RETURN_OK;

- LIBMTP_Handle_Event(ptp_event, &event, &param1);

- break;

- case PTP_ERROR_CANCEL:

- handler_ret = LIBMTP_HANDLER_RETURN_CANCEL;

- break;

- default:

- handler_ret = LIBMTP_HANDLER_RETURN_ERROR;

- break;

- }

- data->cb(handler_ret, event, param1, data->user_data);

- free(data);

-/**

- * This function reads events sent by the device, in a non-blocking manner.

- * The callback function will be called when an event is received, but for the function

- * to make progress, polling must take place, using LIBMTP_Handle_Events_Timeout_Completed.

- *

- * After an event is received, this function should be called again to listen for the next

- * event.

- *

- * For now, this non-blocking mechanism only works with libusb-1.0, and not any of the

- * other usb library backends. Attempting to call this method with another backend will

- * always return an error.

- *

- * @param device a pointer to the MTP device to poll for events.

- * @param cb a callback to be invoked when an event is received.

- * @param user_data arbitrary user data passed to the callback.

- * @return 0 on success, any other value means that the callback was not registered and

- * no event notification will take place.

- */

-int LIBMTP_Read_Event_Async(LIBMTP_mtpdevice_t *device, LIBMTP_event_cb_fn cb, void *user_data) {

- PTPParams *params = (PTPParams *) device->params;

- event_cb_data_t *data = malloc(sizeof(event_cb_data_t));

- uint16_t ret;

- data->cb = cb;

- data->user_data = user_data;

- ret = ptp_usb_event_async(params, LIBMTP_Read_Event_Cb, data);

- return ret == PTP_RC_OK ? 0 : -1;

+ return 0;

}

/**

@@ -2388,7 +2308,6 @@ LIBMTP_error_number_t LIBMTP_Get_Connected_Devices(LIBMTP_mtpdevice_t **device_l

/* Assign linked list of devices */

if (devices == NULL || numdevs == 0) {

*device_list = NULL;

- free(devices);

return LIBMTP_ERROR_NO_DEVICE_ATTACHED;

}

@@ -2496,8 +2415,6 @@ static void add_ptp_error_to_errorstack(LIBMTP_mtpdevice_t *device,

uint16_t ptp_error,

char const * const error_text)

{

- PTPParams *params = (PTPParams *) device->params;

if (device == NULL) {

LIBMTP_ERROR("LIBMTP PANIC: Trying to add PTP error to a NULL device!\n");

return;

@@ -2507,7 +2424,7 @@ static void add_ptp_error_to_errorstack(LIBMTP_mtpdevice_t *device,

outstr[sizeof(outstr)-1] = '\0';

add_error_to_errorstack(device, LIBMTP_ERROR_PTP_LAYER, outstr);

- snprintf(outstr, sizeof(outstr), "Error %04x: %s", ptp_error, ptp_strerror(ptp_error, params->deviceinfo.VendorExtensionID));

+ snprintf(outstr, sizeof(outstr), "Error %04x: %s", ptp_error, ptp_strerror(ptp_error));

outstr[sizeof(outstr)-1] = '\0';

add_error_to_errorstack(device, LIBMTP_ERROR_PTP_LAYER, outstr);

}

@@ -2663,7 +2580,7 @@ static int get_all_metadata_fast(LIBMTP_mtpdevice_t *device)

prop++;

}

lasthandle = 0xffffffff;

- params->objects = calloc (cnt, sizeof(PTPObject));

+ params->objects = calloc (sizeof(PTPObject),cnt);

prop = props;

i = -1;

for (j=0;j<nrofprops;j++) {

@@ -2713,7 +2630,7 @@ static int get_all_metadata_fast(LIBMTP_mtpdevice_t *device)

newprops = realloc(params->objects[i].mtpprops,

(params->objects[i].nrofmtpprops+1)*sizeof(MTPProperties));

} else {

- newprops = calloc(1,sizeof(MTPProperties));

+ newprops = calloc(sizeof(MTPProperties),1);

}

if (!newprops) return 0; /* FIXME: error handling? */

params->objects[i].mtpprops = newprops;

@@ -2729,7 +2646,6 @@ static int get_all_metadata_fast(LIBMTP_mtpdevice_t *device)

/* mark last entry also */

params->objects[i].flags |= PTPOBJECT_OBJECTINFO_LOADED;

params->nrofobjects = i+1;

- free (props);

/* The device might not give the list in linear ascending order */

ptp_objects_sort (params);

return 0;

@@ -3013,8 +2929,7 @@ static int sort_storage_by(LIBMTP_mtpdevice_t *device,int const sortby)

* storage for.

* @param fitsize a file of this file must fit on the device.

-static uint32_t get_writeable_storageid(LIBMTP_mtpdevice_t *device,

- uint64_t fitsize)

+static uint32_t get_writeable_storageid(LIBMTP_mtpdevice_t *device, uint64_t fitsize)

{

LIBMTP_devicestorage_t *storage;

uint32_t store = 0x00000000; //Should this be 0xffffffffu instead?

@@ -3067,32 +2982,6 @@ static uint32_t get_writeable_storageid(LIBMTP_mtpdevice_t *device,

}

/**

- * Tries to suggest a storage_id of a given ID when we have a parent

- * @param device a pointer to the device where to search for the storage ID

- * @param fitsize a file of this file must fit on the device.

- * @param parent_id look for this ID

- * @ret storageID

- */

-static int get_suggested_storage_id(LIBMTP_mtpdevice_t *device,

- uint64_t fitsize,

- uint32_t parent_id)

- PTPParams *params = (PTPParams *) device->params;

- PTPObject *ob;

- uint16_t ret;

- ret = ptp_object_want(params, parent_id, PTPOBJECT_MTPPROPLIST_LOADED, &ob);

- if ((ret != PTP_RC_OK) || (ob->oi.StorageID == 0)) {

- add_ptp_error_to_errorstack(device, ret, "get_suggested_storage_id(): "

- "could not get storage id from parent id.");

- return get_writeable_storageid(device, fitsize);

- } else {

- /* OK we know the parent storage, then use that */

- return ob->oi.StorageID;

- }

-/**

* This function grabs the freespace from a certain storage in

* device storage list.

* @param device a pointer to the MTP device to free the storage

@@ -3181,7 +3070,7 @@ void LIBMTP_Dump_Device_Info(LIBMTP_mtpdevice_t *device)

for (i=0;i<params->deviceinfo.OperationsSupported_len;i++) {

char txt[256];

- (void) ptp_render_ofc(params, params->deviceinfo.OperationsSupported[i],

+ (void) ptp_render_opcode(params, params->deviceinfo.OperationsSupported[i],

sizeof(txt), txt);

printf(" %04x: %s\n", params->deviceinfo.OperationsSupported[i], txt);

}

@@ -4026,45 +3915,6 @@ int LIBMTP_Get_Supported_Filetypes(LIBMTP_mtpdevice_t *device, uint16_t ** const

}

/**

- * This function checks if the device has some specific capabilities, in

- * order to avoid calling APIs that may disturb the device.

- *

- * @param device a pointer to the device to check the capability on.

- * @param cap the capability to check.

- * @return 0 if not supported, any other value means the device has the

- * requested capability.

- */

-int LIBMTP_Check_Capability(LIBMTP_mtpdevice_t *device, LIBMTP_devicecap_t cap)

- switch (cap) {

- case LIBMTP_DEVICECAP_GetPartialObject:

- return (ptp_operation_issupported(device->params,

- PTP_OC_GetPartialObject) ||

- ptp_operation_issupported(device->params,

- PTP_OC_ANDROID_GetPartialObject64));

- case LIBMTP_DEVICECAP_SendPartialObject:

- return ptp_operation_issupported(device->params,

- PTP_OC_ANDROID_SendPartialObject);

- case LIBMTP_DEVICECAP_EditObjects:

- return (ptp_operation_issupported(device->params,

- PTP_OC_ANDROID_TruncateObject) &&

- ptp_operation_issupported(device->params,

- PTP_OC_ANDROID_BeginEditObject) &&

- ptp_operation_issupported(device->params,

- PTP_OC_ANDROID_EndEditObject));

- /*

- * Handle other capabilities here, this is also a good place to

- * blacklist some advanced operations on specific devices if need

- * be.

- */

- default:

- break;

- }

- return 0;

-/**

* This function updates all the storage id's of a device and their

* properties, then creates a linked list and puts the list head into

* the device struct. It also optionally sorts this list. If you want

@@ -5274,19 +5124,16 @@ static uint16_t get_func_wrapper(PTPParams* params, void* priv, unsigned long wa

* This is a manual conversion from MTPDataPutFunc to PTPDataPutFunc

* to isolate the internal type.

-static uint16_t put_func_wrapper(PTPParams* params, void* priv, unsigned long sendlen, unsigned char *data)

+static uint16_t put_func_wrapper(PTPParams* params, void* priv, unsigned long sendlen, unsigned char *data, unsigned long *putlen)

{

MTPDataHandler *handler = (MTPDataHandler *)priv;

uint16_t ret;

uint32_t local_putlen = 0;

ret = handler->putfunc(params, handler->priv, sendlen, data, &local_putlen);

+ *putlen = local_putlen;

switch (ret)

{

case LIBMTP_HANDLER_RETURN_OK:

- if (local_putlen != sendlen)

- return PTP_ERROR_IO;

return PTP_RC_OK;

case LIBMTP_HANDLER_RETURN_ERROR:

return PTP_ERROR_IO;

@@ -6242,12 +6089,12 @@ static int send_file_object_info(LIBMTP_mtpdevice_t *device, LIBMTP_file_t *file

return -1;

}

#endif

if (filedata->storage_id != 0) {

store = filedata->storage_id;

} else {

- store = get_suggested_storage_id(device, filedata->filesize, localph);

+ store = get_writeable_storageid(device, filedata->filesize);

}

// Detect if something non-primary is in use.

storage = device->storage;

if (storage != NULL && store != storage->id) {

@@ -6462,12 +6309,8 @@ static int send_file_object_info(LIBMTP_mtpdevice_t *device, LIBMTP_file_t *file

if (FLAG_ONLY_7BIT_FILENAMES(ptp_usb)) {

strip_7bit_from_utf8(new_file.Filename);

}

- if (filedata->filesize > 0xFFFFFFFFL) {

- // This is a kludge in the MTP standard for large files.

- new_file.ObjectCompressedSize = (uint32_t) 0xFFFFFFFF;

- } else {

- new_file.ObjectCompressedSize = (uint32_t) filedata->filesize;

- }

+ // We lose precision here.

+ new_file.ObjectCompressedSize = (uint32_t) filedata->filesize;

new_file.ObjectFormat = of;

new_file.StorageID = store;

new_file.ParentObject = localph;

@@ -7471,7 +7314,7 @@ LIBMTP_folder_t *LIBMTP_Get_Folder_List(LIBMTP_mtpdevice_t *device)

* if the device does not support all the characters in the

* name.

* @param parent_id id of parent folder to add the new folder to,

- * or 0xFFFFFFFF to put it in the root directory.

+ * or 0 to put it in the root directory.

* @param storage_id id of the storage to add this new folder to.

* notice that you cannot mismatch storage id and parent id:

* they must both be on the same storage! Pass in 0 if you

@@ -7491,7 +7334,7 @@ uint32_t LIBMTP_Create_Folder(LIBMTP_mtpdevice_t *device, char *name,

if (storage_id == 0) {

// I'm just guessing that a folder may require 512 bytes

- store = get_suggested_storage_id(device, 512, parent_id);

+ store = get_writeable_storageid(device, 512);

} else {

store = storage_id;

}

@@ -7798,7 +7641,7 @@ static int create_new_abstract_list(LIBMTP_mtpdevice_t *device,

if (storageid == 0) {

// I'm just guessing that an abstract list may require 512 bytes

- store = get_suggested_storage_id(device, 512, localph);

+ store = get_writeable_storageid(device, 512);

} else {

store = storageid;

}

@@ -8240,7 +8083,6 @@ static int update_abstract_list(LIBMTP_mtpdevice_t *device,

add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL, "update_abstract_list(): "

"could not set artist name.");

}

- break;

case PTP_OPC_Composer:

// Update composer

ret = set_object_string(device, objecthandle, PTP_OPC_Composer, composer);

@@ -8270,7 +8112,6 @@ static int update_abstract_list(LIBMTP_mtpdevice_t *device,

}

free(tmpdate);

}

- break;

default:

break;

}

@@ -9120,114 +8961,6 @@ int LIBMTP_Get_Thumbnail(LIBMTP_mtpdevice_t *device, uint32_t const id,

return -1;

}

-int LIBMTP_GetPartialObject(LIBMTP_mtpdevice_t *device, uint32_t const id,

- uint64_t offset, uint32_t maxbytes,

- unsigned char **data, unsigned int *size)

- PTPParams *params = (PTPParams *) device->params;

- uint16_t ret;

- if (!ptp_operation_issupported(params, PTP_OC_ANDROID_GetPartialObject64)) {

- if (!ptp_operation_issupported(params, PTP_OC_GetPartialObject)) {

- add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL,

- "LIBMTP_GetPartialObject: PTP_OC_GetPartialObject not supported");

- return -1;

- }

- if (offset >> 32 != 0) {

- add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL,

- "LIBMTP_GetPartialObject: PTP_OC_GetPartialObject only supports 32bit offsets");

- return -1;

- }

- ret = ptp_getpartialobject(params, id, (uint32_t)offset, maxbytes, data, size);

- } else {

- ret = ptp_android_getpartialobject64(params, id, offset, maxbytes, data, size);

- }

- if (ret == PTP_RC_OK)

- return 0;

- return -1;

-int LIBMTP_SendPartialObject(LIBMTP_mtpdevice_t *device, uint32_t const id,

- uint64_t offset, unsigned char *data, unsigned int size)

- PTPParams *params = (PTPParams *) device->params;

- uint16_t ret;

- if (!ptp_operation_issupported(params, PTP_OC_ANDROID_SendPartialObject)) {

- add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL,

- "LIBMTP_SendPartialObject: PTP_OC_ANDROID_SendPartialObject not supported");

- return -1;

- }

- ret = ptp_android_sendpartialobject(params, id, offset, data, size);

- if (ret == PTP_RC_OK)

- return 0;

- return -1;

-int LIBMTP_BeginEditObject(LIBMTP_mtpdevice_t *device, uint32_t const id)

- PTPParams *params = (PTPParams *) device->params;

- uint16_t ret;

- if (!ptp_operation_issupported(params, PTP_OC_ANDROID_BeginEditObject)) {

- add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL,

- "LIBMTP_BeginEditObject: PTP_OC_ANDROID_BeginEditObject not supported");

- return -1;

- }

- ret = ptp_android_begineditobject(params, id);

- if (ret == PTP_RC_OK)

- return 0;

- return -1;

-int LIBMTP_EndEditObject(LIBMTP_mtpdevice_t *device, uint32_t const id)

- PTPParams *params = (PTPParams *) device->params;

- uint16_t ret;

- if (!ptp_operation_issupported(params, PTP_OC_ANDROID_EndEditObject)) {

- add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL,

- "LIBMTP_EndEditObject: PTP_OC_ANDROID_EndEditObject not supported");

- return -1;

- }

- ret = ptp_android_endeditobject(params, id);

- if (ret == PTP_RC_OK) {

- // update cached object properties if metadata cache exists

- update_metadata_cache(device, id);

- return 0;

- }

- return -1;

-int LIBMTP_TruncateObject(LIBMTP_mtpdevice_t *device, uint32_t const id,

- uint64_t offset)

- PTPParams *params = (PTPParams *) device->params;

- uint16_t ret;

- if (!ptp_operation_issupported(params, PTP_OC_ANDROID_TruncateObject)) {

- add_error_to_errorstack(device, LIBMTP_ERROR_GENERAL,

- "LIBMTP_TruncateObject: PTP_OC_ANDROID_TruncateObject not supported");

- return -1;

- }

- ret = ptp_android_truncate(params, id, offset);

- if (ret == PTP_RC_OK)

- return 0;

- return -1;

/**

* Get thumbnail format of a file.

* @param device a pointer to the device to get thumbnail format of.

« no previous file with comments | « src/libmtp.h ('k') | src/libmtp.sym » ('j') | no next file with comments »