remove unused variables

diff --git a/libust/serialize.c b/libust/serialize.c
index 95b6e897babeff40b815444710af1646bc77d838..bd947ab1f90d9cd1358bae1538d0f80de2429e62 100644 (file)
--- 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;
        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;
        u64 tsc;
        long buf_offset;
        va_list args_copy;

diff --git a/libust/tracectl.c b/libust/tracectl.c
index a82c107c24364e35bfde21413215c412402cad76..ac551d50e802afec1bcd3a1abdcba6cddbf1c326 100644 (file)
--- 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);
 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)
        int retval = 1<<(hb-1);
 
        if(v-retval == 0)

diff --git a/libustd/libustd.c b/libustd/libustd.c
index e0d48b589afdbd199bdd9f4bb343f0a2ad10196f..3c934536c6785e6d2519b37cc11886dc2351cc8e 100644 (file)
--- 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 *send_msg;
        char *received_msg;
        int result;

-       char *tmp;
-       int fd;

        struct shmid_ds shmds;
 
        buf = (struct buffer_info *) malloc(sizeof(struct buffer_info));
        struct shmid_ds shmds;
 
        buf = (struct buffer_info *) malloc(sizeof(struct buffer_info));

diff --git a/libustd/lowlevel.c b/libustd/lowlevel.c
index 62c8e6b0e095dd8acf40b068cefa696b1619486f..bff27dc692feef7cb648143acee9e54bb55c0968 100644 (file)
--- 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)
 {
 
 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);
        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) {
 
        /* 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]);
                /* 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);
 
 
                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? */
                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 cca9520589015f255992f8fcb7da1e2b68ed605a..18dbf6377a5488dbc0d3f322c7f0663791f1d81f 100644 (file)
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -343,11 +343,9 @@ void sigterm_handler(int sig)
 
 int start_ustd(int fd)
 {
 
 int start_ustd(int fd)
 {

-       struct ustcomm_ustd ustd;

        int result;
        sigset_t sigset;
        struct sigaction sa;
        int result;
        sigset_t sigset;
        struct sigaction sa;

-       int timeout = -1;

 
        struct libustd_callbacks *callbacks = new_callbacks();
        if(!callbacks) {
 
        struct libustd_callbacks *callbacks = new_callbacks();
        if(!callbacks) {