make 64bit safe

diff --git a/opentracker.c b/opentracker.c
index 67e9f9ad94ff790b56928bd119bc391a1055580d..ad6dad41d592e76d1e5a0819b269cf9c30699c16 100644 (file)
--- a/opentracker.c
+++ b/opentracker.c
@@ -318,7 +318,7 @@ static void httpresponse( const int64 s, char *data ) {
           ot_dword diff; struct timeval tv1, tv2; gettimeofday( &tv1, NULL );
           if( !( reply_size = return_stats_for_slash24s( SUCCESS_HTTP_HEADER_LENGTH + static_outbuf, 25, 16 ) ) ) HTTPERROR_500;
           gettimeofday( &tv2, NULL ); diff = ( tv2.tv_sec - tv1.tv_sec ) * 1000000 + tv2.tv_usec - tv1.tv_usec;
-          reply_size += sprintf( SUCCESS_HTTP_HEADER_LENGTH + static_outbuf + reply_size, "Time taken: %ld\n", diff );
+          reply_size += sprintf( SUCCESS_HTTP_HEADER_LENGTH + static_outbuf + reply_size, "Time taken: %u\n", diff );
           break;
 }
         case STATS_SLASH24S_OLD:
@@ -326,7 +326,7 @@ static void httpresponse( const int64 s, char *data ) {
           ot_dword diff; struct timeval tv1, tv2; gettimeofday( &tv1, NULL );
           if( !( reply_size = return_stats_for_slash24s_old( SUCCESS_HTTP_HEADER_LENGTH + static_outbuf, 25, 16 ) ) ) HTTPERROR_500;
           gettimeofday( &tv2, NULL ); diff = ( tv2.tv_sec - tv1.tv_sec ) * 1000000 + tv2.tv_usec - tv1.tv_usec;
-          reply_size += sprintf( SUCCESS_HTTP_HEADER_LENGTH + static_outbuf + reply_size, "Time taken: %ld\n", diff );
+          reply_size += sprintf( SUCCESS_HTTP_HEADER_LENGTH + static_outbuf + reply_size, "Time taken: %u\n", diff );
           break;
 }
       }

diff --git a/trackerlogic.c b/trackerlogic.c
index 9ca283e7fd1a5f4fdd5dd9b42b7d0face81776c6..239efb86954f65a0b4d061577d0429f85598ab18 100644 (file)
--- a/trackerlogic.c
+++ b/trackerlogic.c
@@ -669,7 +669,7 @@ size_t return_stats_for_slash24s( char *reply, size_t amount, ot_dword thresh )
   byte_zero( counts, sizeof( counts ) );
   byte_zero( slash24s, amount * 2 * sizeof(ot_dword) );
 
-  r += sprintf( r, "Stats for all /24s with more than %ld announced torrents:\n\n", thresh );
+  r += sprintf( r, "Stats for all /24s with more than %u announced torrents:\n\n", thresh );
 
   for( i=0; i<256; ++i ) {
     ot_vector *torrents_list = &all_torrents[i];

diff --git a/trackerlogic.h b/trackerlogic.h
index 35dd9c8b18bfb037a9e23c4058c07c2a5b5033d7..37e245102d92e5c061186b9d30fc76ff008d3515 100644 (file)
--- a/trackerlogic.h
+++ b/trackerlogic.h
@@ -11,9 +11,9 @@
 /* Should be called BYTE, WORD, DWORD - but some OSs already have that and there's no #iftypedef */
 /* They mark memory used as data instead of integer or human readable string -
    they should be cast before used as integer/text */
-typedef unsigned char  ot_byte;
-typedef unsigned short ot_word;
-typedef unsigned long  ot_dword;
+typedef uint8_t  ot_byte;
+typedef uint16_t ot_word;
+typedef uint32_t ot_dword;
 
 typedef ot_byte        ot_hash[20];
 typedef ot_dword       ot_ip;