Browse files

Merge remote branch 'tony2001/master' into ipv6

  • Loading branch information...
2 parents 3872d81 + 7055895 commit 973b3eea4d92b73a395553f4f35ca3aee53375ab @octo octo committed Apr 11, 2010
Showing with 3 additions and 6 deletions.
  1. +3 −6 pinba.cc
View
9 pinba.cc
@@ -308,9 +308,7 @@ static inline int php_pinba_req_data_send(pinba_req_data record, HashTable *time
HashTable timers_uniq;
HashPosition pos;
Pinba::Request *request;
- unsigned char *buf;
- int buf_len;
- int i, j, ti, tt;
+ int i;
/* no socket -> bail out */
if (pinba_socket < 0) {
@@ -434,7 +432,8 @@ static inline int php_pinba_req_data_send(pinba_req_data record, HashTable *time
}
if (ret == SUCCESS) {
- ssize_t total_sent = 0, sent;
+ size_t total_sent = 0;
+ ssize_t sent;
string data;
bool res;
@@ -730,7 +729,6 @@ static PHP_FUNCTION(pinba_timer_start)
zval *tags_array, *data = NULL;
pinba_timer_t *t = NULL;
pinba_timer_tag_t **tags;
- struct timeval now;
int tags_num;
struct rusage u;
@@ -785,7 +783,6 @@ static PHP_FUNCTION(pinba_timer_add)
zval *tags_array, *data = NULL;
pinba_timer_t *t = NULL;
pinba_timer_tag_t **tags;
- struct timeval now;
int tags_num;
double value;
unsigned long time_l;

0 comments on commit 973b3ee

Please sign in to comment.