Changeset 17 for abuse/trunk/src/net/includeTweet

Timestamp:

Nov 10, 2005, 9:41:13 PM (17 years ago)

Author:

Sam Hocevar

Message:

• absolute shitloads of 64 bit fixes.

Location:

abuse/trunk/src/net/include

Files:

• endian.hpp (modified) (1 diff)
• fileman.hpp (modified) (4 diffs)
• indian.hpp (modified) (2 diffs)
• ipx.hpp (modified) (1 diff)

abuse/trunk/src/net/include/endian.hpp

@@ -19 +19 @@
 
 #ifdef BIGUNS
-#define swap_short(x) (((((unsigned short) (x)))<<8)|((((unsigned short) (x)))>>8))
-#define swap_long(x) \
-   ((( ((unsigned long)(x)) )>>24)|((( ((unsigned long)(x)) )&0x00ff0000)>>8)| \
-   ((( ((unsigned long)(x)) )&0x0000ff00)<<8)|(( ((unsigned long)(x)) )<<24))
+#define swap_uint16(x) (((((uint16_t) (x)))<<8)|((((uint16_t) (x)))>>8))
+#define swap_uint32(x) \
+   ((( ((uint32_t)(x)) )>>24)|((( ((uint32_t)(x)) )&0x00ff0000)>>8)| \
+   ((( ((uint32_t)(x)) )&0x0000ff00)<<8)|(( ((uint32_t)(x)) )<<24))
 #else
-#define swap_short(x) (x)
-#define swap_long(x) (x)
+#define swap_uint16(x) (x)
+#define swap_uint32(x) (x)
 
 #endif
-
-#define uchar unsigned char
 
 #endif

abuse/trunk/src/net/include/fileman.hpp

@@ -20 +20 @@
 
     nfs_client *next;
-    long size_to_read;  
-    long size;
+    int32_t size_to_read;  
+    int32_t size;
     nfs_client(net_socket *sock, int file_fd, nfs_client *next);
     int send_read();     // flushes as much of size_to_read as possible
@@ -33 +33 @@
     net_socket *sock;
     void r_close(char *reason);
-    long size;   // server tells us the size of the file when we open it
+    int32_t size;   // server tells us the size of the file when we open it
     int open_local;
     remote_file *next; 
@@ -40 +40 @@
     int unbuffered_read(void *buffer, size_t count);
     int unbuffered_write(void *buf, size_t count) { return 0; } // not supported
-    long unbuffered_tell();
-    long unbuffered_seek(long offset);
-    long file_size() { return size; }
+    int32_t unbuffered_tell();
+    int32_t unbuffered_seek(int32_t offset);
+    int32_t file_size() { return size; }
     int open_failure() { return sock==NULL; }    
     ~remote_file();
@@ -64 +64 @@
 
   int rf_open_file(char *&filename, char *mode);
-  long rf_tell(int fd);
-  long rf_seek(int fd, long offset);
+  int32_t rf_tell(int fd);
+  int32_t rf_seek(int fd, int32_t offset);
   int rf_read(int fd, void *buffer, size_t count);
   int rf_close(int fd);
-  long rf_file_size(int fd);
+  int32_t rf_file_size(int fd);
   void set_default_fs(net_address *def) { default_fs=def->copy(); }
   ~file_manager() { if (default_fs) delete default_fs; }

abuse/trunk/src/net/include/indian.hpp

@@ -10 +10 @@
 
 #ifdef BIGUNS
-#define lstl(x) (((((unsigned short) (x)))<<8)|((((unsigned short) (x)))>>8))
+#define lstl(x) (((((uint16_t) (x)))<<8)|((((uint16_t) (x)))>>8))
 #define lltl(x) \
-   ((( ((unsigned long)(x)) )>>24)|((( ((unsigned long)(x)) )&0x00ff0000)>>8)| \
-   ((( ((unsigned long)(x)) )&0x0000ff00)<<8)|(( ((unsigned long)(x)) )<<24))
+   ((( ((uint32_t)(x)) )>>24)|((( ((uint32_t)(x)) )&0x00ff0000)>>8)| \
+   ((( ((uint32_t)(x)) )&0x0000ff00)<<8)|(( ((uint32_t)(x)) )<<24))
 #else
 #define lstl(x) (x)
@@ -19 +19 @@
 
 #endif
-
-#define uchar unsigned char
 
 #endif

abuse/trunk/src/net/include/ipx.hpp

@@ -141 +141 @@
     void add_to_packet(void *buf, int size);
 
-    void write_byte(unsigned char x) { add_to_packet(&x,1); }
-    void write_short(unsigned short x) { x=lstl(x); add_to_packet(&x,2); }
-    void write_long(unsigned long x) { x=lltl(x); add_to_packet(&x,4); }
+    void write_uint8(uint8_t x) { add_to_packet(&x,1); }
+    void write_uint16(uint16_t x) { x=lstl(x); add_to_packet(&x,2); }
+    void write_uint32(uint32_t x) { x=lltl(x); add_to_packet(&x,4); }