Revert "Uprev libmtp to 1.1.12"

examples/albumart.c

 /** 
  * \file albumart.c
  * Example program to send album art.
  *
  * Copyright (C) 2006 Andy Kelk <andy@mopoke.co.uk>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 37 matching lines @@
   uint32_t *ids = NULL;
   uint32_t *tmp = NULL;
   uint64_t filesize;
   char *imagedata = NULL;
   char *albumname = NULL;
   char *path = NULL;
   char *rest;
   struct stat statbuff;
   uint32_t storageid = 0;
   uint32_t parentid = 0;
-  int ret;
 
   fprintf(stdout, "libmtp version: " LIBMTP_VERSION_STRING "\n\n");
 
   while ( (opt = getopt(argc, argv, "dhn:i:s:p:")) != -1 ) {
     switch (opt) {
     case 'h':
       usage();
     case 'd':
       LIBMTP_Set_Debug(LIBMTP_DEBUG_PTP | LIBMTP_DEBUG_DATA);
       break;
@@ skipping 49 matching lines @@
 
 #ifdef __WIN32__
   if ( (fd = open(path, O_RDONLY|O_BINARY) == -1) ) {
 #else
   if ( (fd = open(path, O_RDONLY)) == -1) {
 #endif
     printf("Couldn't open image file %s (%s)\n",path,strerror(errno));
     return 1;
   }
   else {
-    ret = read(fd, imagedata, filesize);
-    if (ret == -1) perror("read");
+    read(fd, imagedata, filesize);
     close(fd);
   }
 
   LIBMTP_Init();
   device = LIBMTP_Get_First_Device();
   if (device == NULL) {
     printf("No devices.\n");
     return 0;
   }
 
   LIBMTP_filesampledata_t *albumart = LIBMTP_new_filesampledata_t();
   albumart->data = imagedata;
   albumart->size = filesize;
   albumart->filetype = LIBMTP_FILETYPE_JPEG;
 
   LIBMTP_album_t *album = LIBMTP_new_album_t();
   album->name = albumname;
   album->no_tracks = idcount;
   album->tracks = ids;
   album->parent_id = parentid;
   album->storage_id = storageid;
-
-  ret = LIBMTP_Create_New_Album(device,album);
+  int ret = LIBMTP_Create_New_Album(device,album);
   if (ret == 0) {
     ret = LIBMTP_Send_Representative_Sample(device,album->album_id, albumart);
     if (ret != 0) {
       printf("Couldn't send album art\n");
       LIBMTP_Dump_Errorstack(device);
       LIBMTP_Clear_Errorstack(device);
     }
   }
   else {
     printf("Couldn't create album object\n");
     LIBMTP_Dump_Errorstack(device);
     LIBMTP_Clear_Errorstack(device);
   }
 
   LIBMTP_destroy_filesampledata_t(albumart);
   LIBMTP_destroy_album_t(album);
 
   LIBMTP_Release_Device(device);
   printf("OK.\n");
   return 0;
 }