projects / packages / gabber.git / blame
| Commit | Line | Data |
|---|---|---|
| f39d0390 JB |
1 | --- gabber-1.9.0/src/TCPTransmitter.cc.orig 2003-06-08 22:15:19.000000000 +0000 |
| 2 | +++ gabber-1.9.0/src/TCPTransmitter.cc 2003-10-27 15:31:33.000000000 +0000 | |
| 3 | @@ -386,7 +386,7 @@ | |
| 4 | ||
| 5 | void TCPTransmitter::_send(send_data_buf* data) | |
| 6 | { | |
| 7 | - guint bytes_written = 0; | |
| 8 | + gsize bytes_written = 0; | |
| 9 | // Write the data to the socket using glib | |
| 10 | GError *err = NULL; | |
| 11 | GIOStatus result = G_IO_STATUS_NORMAL; | |
| 12 | @@ -553,7 +553,7 @@ | |
| 13 | case G_IO_IN: | |
| 14 | { | |
| 15 | // Read the data from the socket and push it into the session | |
| 16 | - guint bytes_read = 2047; | |
| 17 | + gsize bytes_read = 2047; | |
| 18 | guint bytes_count = 0; | |
| 19 | char buf[2048]; | |
| 20 | GError *err = NULL; | |
| 21 | @@ -767,7 +767,7 @@ | |
| 22 | guint buf_length = sizeof(struct in_addr); | |
| 23 | #endif | |
| 24 | gchar * buffer = new gchar[buf_length]; | |
| 25 | - guint bytes_read = 0; | |
| 26 | + gsize bytes_read = 0; | |
| 27 | GError *err = NULL; | |
| 28 | g_io_channel_set_encoding(iochannel, NULL, &err); | |
| 29 | GIOStatus result = g_io_channel_read_chars(iochannel, buffer, | |
| 30 | @@ -797,7 +797,7 @@ | |
| 31 | #endif | |
| 32 | //when this happens wait a second and try again | |
| 33 | sleep(1); | |
| 34 | - guint next_bytes_read; | |
| 35 | + gsize next_bytes_read; | |
| 36 | result = g_io_channel_read_chars(iochannel, &buffer[bytes_read], | |
| 37 | buf_length - bytes_read, &next_bytes_read, &err); | |
| 38 | if (result == G_IO_STATUS_NORMAL) | |
| 39 | @@ -1936,7 +1936,7 @@ | |
| 40 | ||
| 41 | void TCPTransmitter::proxySendHead(const string& header) | |
| 42 | { | |
| 43 | - guint bytes_written; | |
| 44 | + gsize bytes_written; | |
| 45 | GError *err = NULL; | |
| 46 | ||
| 47 | gchar *sendbuffer = new gchar[header.size()]; | |
| 48 | --- gabber-1.9.0/src/Singleton.hh.orig 2003-06-03 17:57:11.000000000 +0000 | |
| 49 | +++ gabber-1.9.0/src/Singleton.hh 2003-10-27 15:24:35.000000000 +0000 | |
| 50 | @@ -11,6 +11,7 @@ | |
| 51 | #define GABBER_SINGLETON_H | |
| 52 | ||
| 53 | #include <assert.h> | |
| 54 | +#include <stddef.h> | |
| 55 | ||
| 56 | namespace Gabber { | |
| 57 | ||
| 58 | @@ -27,8 +28,8 @@ | |
| 59 | Singleton( void ) | |
| 60 | { | |
| 61 | assert( !ms_Singleton ); | |
| 62 | - int offset = (int)(T*)1 - (int)(Singleton <T>*)(T*)1; | |
| 63 | - ms_Singleton = (T*)((int)this + offset); | |
| 64 | + size_t offset = (size_t)(T*)1 - (size_t)(Singleton <T>*)(T*)1; | |
| 65 | + ms_Singleton = (T*)((size_t)this + offset); | |
| 66 | } | |
| 67 | ~Singleton( void ) | |
| 68 | { assert( ms_Singleton ); ms_Singleton = 0; } |