From: Alexis Hallé <alexis.halle@polymtl.ca>
Date: Wed, 4 Aug 2010 15:18:15 +0000 (-0400)
Subject: remove unused variables
X-Git-Tag: v0.7~8
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5f9aacae75a4181a54bf16f31ce8e18229dddc60;p=ust.git

remove unused variables
---

diff --git a/libust/serialize.c b/libust/serialize.c
index 95b6e89..bd947ab 100644
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -636,7 +636,6 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 	struct ust_channel *channel;
 	struct ust_trace *trace, *dest_trace = NULL;
 	struct ust_buffer *buf;
-	void *transport_data;
 	u64 tsc;
 	long buf_offset;
 	va_list args_copy;
diff --git a/libust/tracectl.c b/libust/tracectl.c
index a82c107..ac551d5 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -469,7 +469,6 @@ static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr
 static unsigned int pow2_higher_or_eq(unsigned int v)
 {
 	int hb = fls(v);
-	int hbm1 = hb-1;
 	int retval = 1<<(hb-1);
 
 	if(v-retval == 0)
diff --git a/libustd/libustd.c b/libustd/libustd.c
index e0d48b5..3c93453 100644
--- a/libustd/libustd.c
+++ b/libustd/libustd.c
@@ -188,8 +188,6 @@ struct buffer_info *connect_buffer(struct libustd_instance *instance, pid_t pid,
 	char *send_msg;
 	char *received_msg;
 	int result;
-	char *tmp;
-	int fd;
 	struct shmid_ds shmds;
 
 	buf = (struct buffer_info *) malloc(sizeof(struct buffer_info));
diff --git a/libustd/lowlevel.c b/libustd/lowlevel.c
index 62c8e6b..bff27dc 100644
--- a/libustd/lowlevel.c
+++ b/libustd/lowlevel.c
@@ -64,8 +64,6 @@ size_t subbuffer_data_size(void *subbuf)
 
 void finish_consuming_dead_subbuffer(struct libustd_callbacks *callbacks, struct buffer_info *buf)
 {
-	int result;
-
 	struct ust_buffer *ustbuf = buf->bufstruct_mem;
 
 	long write_offset = uatomic_read(&ustbuf->offset);
@@ -95,7 +93,6 @@ void finish_consuming_dead_subbuffer(struct libustd_callbacks *callbacks, struct
 
 	/* Iterate on subbuffers to recover. */
 	for(i_subbuf = first_subbuf % buf->n_subbufs; ; i_subbuf++, i_subbuf %= buf->n_subbufs) {
-		void *tmp;
 		/* commit_seq is the offset in the buffer of the end of the last sequential commit.
 		 * Bytes beyond this limit cannot be recovered. This is a free-running counter. */
 		long commit_seq = uatomic_read(&ustbuf->commit_seq[i_subbuf]);
@@ -106,8 +103,6 @@ void finish_consuming_dead_subbuffer(struct libustd_callbacks *callbacks, struct
 
 		struct ltt_subbuffer_header *header = (struct ltt_subbuffer_header *)((char *)buf->mem+i_subbuf*buf->subbuf_size);
 
-		int pad_size;
-
 		if((commit_seq & commit_seq_mask) == 0) {
 			/* There is nothing to do. */
 			/* FIXME: is this needed? */
diff --git a/ustd/ustd.c b/ustd/ustd.c
index cca9520..18dbf63 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -343,11 +343,9 @@ void sigterm_handler(int sig)
 
 int start_ustd(int fd)
 {
-	struct ustcomm_ustd ustd;
 	int result;
 	sigset_t sigset;
 	struct sigaction sa;
-	int timeout = -1;
 
 	struct libustd_callbacks *callbacks = new_callbacks();
 	if(!callbacks) {