Version bump to 2.5.3

Fixed wrong filesizes under windows platforms.
Fixed some warnings.
Bumped soname.

Author: codestation

ChangeLog

@@ -1,3 +1,9 @@
+vitamtp (2.5.3) unstable; urgency=low
+
+  * Fixed wrong size in metadata under windows platforms.
+
+ -- codestation <codestation404@gmail.com>  Sun, 29 Jun 2014 00:00:00 -0000
+
 vitamtp (2.5.2) unstable; urgency=low
 
   * Added pkg support

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.52])
-AC_INIT([vitamtp], [2.5.2], [codestation@gmail.com])
+AC_INIT([vitamtp], [2.5.3], [codestation@gmail.com])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([src/vitamtp.c])
@@ -89,9 +89,7 @@ AC_SUBST(PTHREAD_LIBS)
 
 # Checks for additional headers
 AC_CHECK_HEADERS([errno.h fcntl.h iconv.h limits.h memory.h signal.h stdarg.h stddef.h stdlib.h string.h time.h unistd.h], [], [AC_MSG_ERROR([Cannot find required header.])])
-if test x"$mingw_compiler" != "xyes" ; then
-    AC_CHECK_HEADERS([dirent.h ftw.h sys/stat.h sys/statvfs.h], [], [AC_MSG_ERROR([Cannot find required header.])])
-else
+if test x"$mingw_compiler" == "xyes" ; then
     AC_CHECK_HEADERS([windows.h], [], [AC_MSG_ERROR([Cannot find required header.])])
 fi
 

src/Makefile.am

@@ -22,7 +22,7 @@ include_HEADERS=vitamtp.h
 #  increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed,
 #  REVISION is set to 0, otherwise REVISION is incremented.
 # ---------------------------------------------------------------------------
-CURRENT=3
+CURRENT=4
 AGE=0
 REVISION=0
 SOVERSION=$(CURRENT):$(REVISION):$(AGE)
@@ -39,7 +39,7 @@ libvitamtp_la_SOURCES=vitamtp.h datautils.c device.c ptp.c usb.c vitamtp.c wirel
 if COMPILE_MINGW32
 libvitamtp_la_SOURCES += asprintf.c socketpair.c
 endif
-libvitamtp_la_CFLAGS=-std=gnu99 -fgnu89-inline -Wall $(XML_CFLAGS) $(LIBUSB_CFLAGS) $(DEVICE_CFLAGS) $(PTHREAD_CFLAGS) $(W32_CFLAGS)
+libvitamtp_la_CFLAGS=-std=gnu99 -fgnu89-inline -Wall -Wextra -Wno-unused-parameter $(XML_CFLAGS) $(LIBUSB_CFLAGS) $(DEVICE_CFLAGS) $(PTHREAD_CFLAGS) $(W32_CFLAGS)
 libvitamtp_la_LDFLAGS=$(XML_LIBS) $(LIBUSB_LIBS) $(PTHREAD_LIBS) -no-undefined -export-symbols-regex "VitaMTP_[0-9A-Za-z_]+" -version-info $(SOVERSION) $(W32_LDFLAGS)
 libvitamtp_la_LIBADD=$(LTLIBICONV)
 

src/datautils.c

@@ -58,7 +58,7 @@ char *VitaMTP_Data_Add_Size_Header(const char *orig, uint32_t len)
  *
  * @param time a Unix timestamp
  */
-char *VitaMTP_Data_Make_Timestamp(long time)
+char *VitaMTP_Data_Make_Timestamp(time_t time)
 {
     //  YYYY-MM-DDThh:mm:ss+hh:mm
     time_t tlocal = time; // save local time because gmtime modifies it

src/usb.c

@@ -196,7 +196,7 @@ ptp_read_func(
             VitaMTP_hex_dump(bytes, xread, 16);
 
         // want to discard extra byte
-        if (expect_terminator_byte && xread == toread)
+        if (expect_terminator_byte && xread == (int)toread)
         {
             VitaMTP_Log(VitaMTP_DEBUG, "<==USB IN\nDiscarding extra byte\n");
 
@@ -244,7 +244,7 @@ ptp_read_func(
             }
         }
 
-        if (xread < toread) /* short reads are common */
+        if (xread < (int)toread) /* short reads are common */
             break;
     }
 
@@ -313,7 +313,7 @@ ptp_write_func(
         else
         {
             // This magic makes packets the same size that WMP send them.
-            if (towrite > ptp_usb->outep_maxpacket && towrite % ptp_usb->outep_maxpacket != 0)
+            if ((int)towrite > ptp_usb->outep_maxpacket && towrite % ptp_usb->outep_maxpacket != 0)
             {
                 towrite -= towrite % ptp_usb->outep_maxpacket;
             }
@@ -382,7 +382,7 @@ ptp_write_func(
             }
         }
 
-        if (xwritten < towrite) /* short writes happen */
+        if (xwritten < (int)towrite) /* short writes happen */
             break;
     }
 
@@ -597,7 +597,8 @@ ptp_usb_senddata(PTPParams *params, PTPContainer *ptp,
                 )
 {
     uint16_t ret = PTP_RC_OK;
-    int wlen, datawlen;
+    int wlen;
+    unsigned long datawlen;
     PTPUSBBulkContainer usbdata;
     unsigned long bytes_left_to_transfer, written;
     PTPDataHandler memhandler;
@@ -1095,7 +1096,7 @@ ptp_usb_control_cancel_request(PTPParams *params, uint32_t transactionid)
                                   sizeof(buffer),
                                   ptp_usb->timeout);
 
-    if (ret < sizeof(buffer))
+    if (ret < (int)sizeof(buffer))
         return PTP_ERROR_IO;
 
     return PTP_RC_OK;

src/vitamtp.h

@@ -25,6 +25,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
+#include <time.h>
 
 /**
  * Unopened Vita USB device
@@ -224,8 +225,8 @@ struct metadata
     char *name;
     char *path;
     int type;
-    unsigned long dateTimeCreated; // unix timestamp
-    unsigned long size;
+    time_t dateTimeCreated; // unix timestamp
+    uint64_t size;
     enum DataType dataType;
 
     union
@@ -816,7 +817,7 @@ void VitaMTP_RegisterCancelEventId(uint32_t event_id);
  * Functions to parse data
  */
 char *VitaMTP_Data_Add_Size_Header(const char *orig, uint32_t len);
-char *VitaMTP_Data_Make_Timestamp(long time);
+char *VitaMTP_Data_Make_Timestamp(time_t time);
 int VitaMTP_Data_Info_From_XML(vita_info_t *vita_info, const char *raw_data, const int len);
 int VitaMTP_Data_Initiator_To_XML(const initiator_info_t *p_initiator_info, char **data, int *len);
 const initiator_info_t *VitaMTP_Data_Initiator_New(const char *host_name, int protocol_version);

src/wireless.c

@@ -1514,6 +1514,8 @@ static int VitaMTP_Get_Wireless_Device(wireless_host_info_t *info, vita_device_t
             else if (strcmp(method, "REGISTER") == 0)
             {
                 wireless_vita_info_t info;
+                memset(&info, 0, sizeof(info));
+
                 char *pin_try = NULL;
                 VitaMTP_Parse_Device_Headers(data+read, &info, NULL, &pin_try);