[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] make it build on amd64
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or
Modified Files:
or.h test.c
Log Message:
make it build on amd64
Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -d -r1.430 -r1.431
--- or.h 14 Oct 2004 02:47:09 -0000 1.430
+++ or.h 14 Oct 2004 03:13:08 -0000 1.431
@@ -488,8 +488,8 @@
time_t timestamp_lastread; /**< When was the last time poll() said we could read? */
buf_t *outbuf; /**< Buffer holding data to write over this connection. */
- int outbuf_flushlen; /**< How much data should we try to flush from the
- * outbuf? */
+ size_t outbuf_flushlen; /**< How much data should we try to flush from the
+ * outbuf? */
time_t timestamp_lastwritten; /**< When was the last time poll() said we could write? */
time_t timestamp_created; /**< When was this connection_t created? */
@@ -1193,7 +1193,7 @@
int dirserv_load_from_directory_string(const char *dir);
void dirserv_free_descriptors();
void dirserv_remove_old_servers(int age);
-int dirserv_dump_directory_to_string(char *s, unsigned int maxlen,
+int dirserv_dump_directory_to_string(char *s, size_t maxlen,
crypto_pk_env_t *private_key);
void directory_set_dirty(void);
size_t dirserv_get_directory(const char **cp, int compress);
Index: test.c
===================================================================
RCS file: /home/or/cvsroot/src/or/test.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- test.c 14 Oct 2004 02:47:09 -0000 1.126
+++ test.c 14 Oct 2004 03:13:08 -0000 1.127
@@ -264,7 +264,7 @@
crypto_pk_env_t *pk1, *pk2;
char *data1, *data2, *data3, *cp;
int i, j, p, len;
- int size;
+ size_t size;
data1 = tor_malloc(1024);
data2 = tor_malloc(1024);
@@ -1110,7 +1110,7 @@
char address2[] = "aaaaaaaaaaaaaaaa.onion";
rend_service_descriptor_t *d1, *d2;
char *encoded;
- int len;
+ size_t len;
crypto_pk_env_t *pk1;
time_t now;
pk1 = crypto_new_pk_env();