]> rtime.felk.cvut.cz Git - frescor/frsh-forb.git/commitdiff
Get rid of the most of other warnings
authorMichal Sojka <sojka@os.inf.tu-dresden.de>
Tue, 7 Feb 2012 23:52:57 +0000 (00:52 +0100)
committerMichal Sojka <sojka@os.inf.tu-dresden.de>
Tue, 7 Feb 2012 23:52:57 +0000 (00:52 +0100)
19 files changed:
src/forb/forb-idl/forb-idl-c-skels.c
src/forb/forb-idl/forb-idl-c-stubs.c
src/forb/forb-idl/forb-idl-driver.c
src/frsh/demo/dcamera/camserver.c
src/frsh/fres/cbroker/fcb.c
src/frsh/fres/contract/fres_container.c
src/frsh/frsh_api/tests/dummy_spare_capacity.c
src/frsh/frsh_api/tests/negotiation.c
src/frsh/resources/disk_bfq/mngr/diskbfq_mngr.c
src/frsh/resources/item/frm_item.c
src/frsh/resources/item/serialsource.c
src/fwp/fwp/lib/fwp/fwp_msgq.c
src/fwp/fwp/lib/fwp/tests/fwp_msgtest/fwp_msgtest.c
src/fwp/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test2.c
src/fwp/fwp/tests/timing/fwp-timing.c
src/fwp/wme_test/wclient.c
src/fwp/wme_test/wserver.c
src/ulut/ulut/ul_gsa.c
src/ulut/ulut/ul_hashtabprim.c

index 1d353381e186063ebbb45c5c500effff1a711774..d0d6971f75345871da6ebff0201cee69bda8c4df 100644 (file)
@@ -267,11 +267,11 @@ static void ck_output_op_skel(IDL_tree op, char *intf_id, OIDL_Run_Info *rinfo,
 {
        char *id, *id_plain;
        IDL_tree sub;
-       gboolean  has_retval, has_args;
+       gboolean  has_retval/* , has_args */;
        const char *const seq_init = " = {0,0,NULL}";
 
        has_retval = IDL_OP_DCL (op).op_type_spec != NULL;
-       has_args   = IDL_OP_DCL (op).parameter_dcls != NULL;
+       /* has_args   = IDL_OP_DCL (op).parameter_dcls != NULL; */
        
        id = IDL_ns_ident_to_qstring(IDL_IDENT_TO_NS(IDL_OP_DCL(op).ident), "_", 0);
        id_plain = IDL_IDENT(IDL_OP_DCL(op).ident).str;
index cb4bd17d4812be766d2044c2d31337ba44922d13..b26c0cf1a404893c712916b689aabc52f5d673f3 100644 (file)
@@ -14,7 +14,7 @@ cs_output_stub (IDL_tree     tree,
        char     *iface_id;
        char     *opname;
        char     *opname_plain;
-       gboolean  has_retval, has_args;
+       gboolean  has_retval/* , has_args */;
 
        g_return_if_fail (idx != NULL);
 
@@ -26,7 +26,7 @@ cs_output_stub (IDL_tree     tree,
        opname = IDL_ns_ident_to_qstring (IDL_IDENT_TO_NS (IDL_OP_DCL (tree).ident), "_", 0);
 
        has_retval = IDL_OP_DCL (tree).op_type_spec != NULL;
-       has_args   = IDL_OP_DCL (tree).parameter_dcls != NULL;
+       /* has_args   = IDL_OP_DCL (tree).parameter_dcls != NULL; */
 
        forb_cbe_op_write_proto (of, tree, "", FALSE);
 
index adc860f45fd8baad4e4477931d7f984370ed7b34..474f54f3da03aafec26cefd99ba9b2227bc274f3 100644 (file)
@@ -64,7 +64,7 @@ forb_idl_to_backend (const char    *filename,
        IDL_ns   ns;
        IDL_tree tree;
        int      errcode;
-       gboolean retval;
+       gboolean retval = false;
 
        errcode = IDL_parse_filename (
                        filename, rinfo->cpp_args, NULL,
index 8e41cd09c06b0a8612b9b1123deb94d28aa42cc9..996ebf97a9e5a8cadafe2aebd3f4aa907c84dea6 100644 (file)
@@ -181,10 +181,10 @@ int main(int argc, char *argv[])
 {
        int ret;
 
-       video_args_t video_args;
+/*     video_args_t video_args; */
 
-       video_args.argc = argc;
-       video_args.argv = argv;
+/*     video_args.argc = argc; */
+/*     video_args.argv = argv; */
        
        negotiate_contracts();
        init_grabber(); 
index 0bd1bb46264953ce82df24d2a8e0b5587cfa2b44..a1961bfbae5249cc2402182a1abee0d4dc3b89f0 100644 (file)
@@ -473,7 +473,7 @@ check_and_setup_resource(struct fcb *fcb, struct fcb_contract *fcb_contracts[],
                         int num)
 {
        unsigned i;
-       struct res_alloc *ra;
+       struct res_alloc *ra = NULL;
        struct res_key key, key2 = {-1,-1};
 
        for (i=0; i<num; i++) {
index dfee5d5223d1c58d67d78aa1e393bd79b798adb0..031090e30598e4198bd41c3eae85f2b53ffdfb84 100644 (file)
@@ -478,8 +478,8 @@ serialize_block(FORB_CDR_Codec *codec, enum fres_block_type type, const struct f
 {
        CORBA_boolean ret;
        CORBA_short type_short = type;
-       CORBA_unsigned_short flags;
-       CORBA_long length;
+       CORBA_unsigned_short flags = 0;
+       CORBA_long length = 0;
        unsigned int wptr_of_length, wptr_tmp, wptr_of_block_beg;
 
        switch (b->state) {
index aef63858c28380cdbdade06d395ced700729e255..183de4d8a3b0ab9b7a94105e977610e0e5f3e217 100644 (file)
@@ -43,7 +43,6 @@ WVTEST_MAIN("spare capacity")
 {
        frsh_contract_t contract;
        frsh_rel_time_t zero = fosa_msec_to_rel_time(0);
-       int ret;
        int min, max;
 
 /*     ul_log_domain_arg2levels(optarg); */
@@ -52,19 +51,19 @@ WVTEST_MAIN("spare capacity")
        WVFRSH(frsh_init());
        
        /* Contract negotiation for CPU */
-       ret = WVFRSH(frsh_contract_init(&contract));
+       WVFRSH(frsh_contract_init(&contract));
                
-       ret = WVFRSH(frsh_contract_set_basic_params(&contract,
+       WVFRSH(frsh_contract_set_basic_params(&contract,
                                             &utilization_set.utilizations[0].budget,
                                             &utilization_set.utilizations[0].period,
                                             FRSH_WT_BOUNDED,
                                                    FRSH_CT_REGULAR));
 
-       ret = WVFRSH(frsh_contract_set_resource_and_label(&contract ,
+       WVFRSH(frsh_contract_set_resource_and_label(&contract ,
                                                   DUMMY_RESOURCE_TYPE, DUMMY_RESOURCE_ID,
                                                          "spare cap test"));
 
-       ret = WVFRSH(frsh_contract_set_reclamation_params(&contract,
+       WVFRSH(frsh_contract_set_reclamation_params(&contract,
                                                   &zero,
                                                   &utilization_set.utilizations[utilization_set.size-1].budget,
                                                   &utilization_set.utilizations[utilization_set.size-1].period,
@@ -90,10 +89,10 @@ WVTEST_MAIN("spare capacity")
        WVPASS(min == 20 && max == 20);
        
 
-       ret = WVFRSH(frsh_contract_cancel(vres[0]));
-       ret = WVFRSH(frsh_contract_cancel(vres[1]));
-       ret = WVFRSH(frsh_contract_cancel(vres[2]));
-       ret = WVFRSH(frsh_contract_cancel(vres[3]));
+       WVFRSH(frsh_contract_cancel(vres[0]));
+       WVFRSH(frsh_contract_cancel(vres[1]));
+       WVFRSH(frsh_contract_cancel(vres[2]));
+       WVFRSH(frsh_contract_cancel(vres[3]));
        frsh_destroy();
 }
 
index cfdd0b773a6113ae957de0b57403dfeb5c4ccfec..7bb6e5084e073463daad8f384aca1c86f86b0df9 100644 (file)
@@ -7,19 +7,17 @@
 
 WVTEST_MAIN("single negotiation and cancelation")
 {
-       int ret;
-
        frsh_contract_t contract, c;
        frsh_vres_id_t vres;
        frsh_rel_time_t budget, period, deadline;
 
        setenv("WVTEST_DIE_FAST", "", 1);
-       ret = WVFRSH(frsh_init());
+       WVFRSH(frsh_init());
 
        /* Negotiate the contract */
-       ret = WVFRSH(frsh_contract_init(&contract));
+       WVFRSH(frsh_contract_init(&contract));
        
-       ret = WVFRSH(frsh_contract_set_resource_and_label(
+       WVFRSH(frsh_contract_set_resource_and_label(
                             &contract,
                             DUMMY_RESOURCE_TYPE, DUMMY_RESOURCE_ID,
                             NULL));
@@ -27,22 +25,22 @@ WVTEST_MAIN("single negotiation and cancelation")
        budget = fosa_msec_to_rel_time(10);
        period = fosa_msec_to_rel_time(100);
        deadline = fosa_msec_to_rel_time(50);
-       ret = WVFRSH(frsh_contract_set_basic_params(&contract,
+       WVFRSH(frsh_contract_set_basic_params(&contract,
                                                    &budget,
                                                    &period,
                                                    FRSH_WT_BOUNDED,
                                                    FRSH_CT_REGULAR));
        
-       ret = WVFRSH(frsh_contract_set_timing_reqs(&contract,
+       WVFRSH(frsh_contract_set_timing_reqs(&contract,
                                                   false, &deadline));
        
-       ret = WVFRSH(frsh_contract_negotiate(&contract, &vres));
+       WVFRSH(frsh_contract_negotiate(&contract, &vres));
        WVFRSH(frsh_vres_get_contract(vres, &c));
        WVPASS(fres_contract_get_budget(&c, &budget));
        WVPASS(fosa_rel_time_to_msec(budget) == 10);
 
        /* Cancel the contract */
-       ret = WVFRSH(frsh_contract_cancel(vres));
+       WVFRSH(frsh_contract_cancel(vres));
 
        frsh_destroy();
 }
index 5e0379b0bf2532ac1e7dc835f898cc00e96536e9..545774e205bb89a58c74c8060864b8dd086522c4 100644 (file)
@@ -114,13 +114,13 @@ static int diskbfq_admtest(struct fres_sa_scenario *scenario,
 
        fres_sa_scenario_for_each_no_cancel_contract(scenario, c) {
                fres_block_basic *basic;
-               fres_block_resource *resource;
+               //fres_block_resource *resource;
                fres_block_disk_sched *disk_sched;
                char id[40];
 
                fres_contract_id_to_string(id, &c->contract->id, sizeof(id));
                basic = fres_contract_get_basic(c->contract);
-               resource = fres_contract_get_resource(c->contract);
+               //resource = fres_contract_get_resource(c->contract);
 
                period = fosa_rel_time_to_nsec(basic->period);
                budget = fosa_rel_time_to_nsec(basic->budget);
index 6ab2ee23a6290edf16d3e7decb8bf203c9fd88de..9574333236901eac5bd1701775db1b192d5dab2e 100644 (file)
@@ -264,7 +264,7 @@ int forb_main(forb_orb orb, int argc, char *argv[])
 
        // ITEM ADD     
        threadRead = init(parametrsITEM);
-       //if (threadRead == NULL) error (1, errno, "Cannot run the ITEM PC Manager");   //TODO fix the worning
+       if (!threadRead) error (1, errno, "Cannot run the ITEM PC Manager");    //TODO fix the worning
        
        
        forb_executor_run(&executor);
index 6c1b88826116dd6ae5024d65337f8146d6c47573..ec6b2263efd5cc7c753be629cb9154d0e6db57e9 100644 (file)
@@ -810,11 +810,6 @@ int platform_baud_rate(char *platform_name)
     void (*add)(struct pargs *args, const char *name, int baudrate);
     struct pargs *x;
   } Platform = { padd, &args };
-  static struct {
-    struct {
-      int packet;
-    } tinyos;
-  } net;
 
   if (isdigit(platform_name[0]))
     return atoi(platform_name);
index 1af89bdfe2e5363059f51308d96851629d570594..443aec04f9bcc3a9d9a7842119968a7772b8b29f 100644 (file)
@@ -89,7 +89,7 @@ int fwp_msgq_enqueue(struct fwp_msgq *msgq, struct fwp_msgb *msgb)
        /* depends on queuing policy specifies in endpoint */
        msgq->queue[msgq->in] = msgb;
        msgq->nr_pending++;
-       msgq->in = (++msgq->in) & (FWP_MSGQ_SIZE - 1);
+       msgq->in = (msgq->in + 1) & (FWP_MSGQ_SIZE - 1);
 
        sem_post(&msgq->msg_sem);
        /* release queue mutex */
@@ -116,7 +116,7 @@ struct fwp_msgb* fwp_msgq_dequeue(struct fwp_msgq *msgq)
        
        msgb = msgq->queue[msgq->out];
        msgq->nr_pending--;
-       msgq->out = (++msgq->out) & (FWP_MSGQ_SIZE - 1);
+       msgq->out = (msgq->out + 1) & (FWP_MSGQ_SIZE - 1);
        
        /* release queue mutex */
        pthread_mutex_unlock(&msgq->lock);
@@ -157,7 +157,7 @@ void fwp_msgq_dequeue_all(struct fwp_msgq *msgq)
        while (msgq->in != msgq->out){
                msgb = msgq->queue[msgq->out];
                msgq->nr_pending--;
-               msgq->out = (++msgq->out) & (FWP_MSGQ_SIZE - 1);
+               msgq->out = (msgq->out + 1) & (FWP_MSGQ_SIZE - 1);
                fwp_msgb_free(msgb);
        }
        
index ff1877c43ffc41230f9aa14acf027c6315bdd5b9..d6f1c974700680a832d6eb5f813df56de12cf675 100644 (file)
@@ -21,9 +21,7 @@ int main(int argc, char** argv)
        int val_w1 = 1;
        int val_w2 = 2;
        int val_r1, val_r2;
-       int nparams;
 
-       nparams = argc;
        fwp_msgq_init(&msgq);   
        printf("in=%d out=%d pending=%d \n",msgq.in,msgq.out,msgq.nr_pending);
        
index c42de6a0088e0ef3d5b1c2b3670fbe4559840608..ac57b2661e2f6de3640bc1a79984aa9fda7d40d8 100644 (file)
@@ -57,7 +57,7 @@ void* receiver(void* arg)
 int main()
 {
        fwp_vres_t *vres1;
-       struct fwp_vres_params vparam1, vparam2;
+       struct fwp_vres_params vparam1;
        char msg1[] = "Hello1";
        char msg2[] = "Hello2";
        struct fwp_endpoint *sepoint1;
@@ -68,11 +68,6 @@ int main()
        vparam1.period.tv_sec = 0; 
        vparam1.period.tv_nsec = 10000; 
 
-       vparam2.ac_id = FWP_AC_BK; 
-       vparam2.budget = 100;
-       vparam2.period.tv_sec = 0;
-       vparam2.period.tv_nsec = 100000;
-
        printf("Start\n");
        if (fwp_init() != 0) {
                printf("FWP initialization failed!\n");
index 4ed0c28458fc6d08a1af20c6183e13d7c5e43744..b465bce8e2d068bc4bc96fb044576108079e8a83 100644 (file)
@@ -375,6 +375,7 @@ void *receiver(void *arg)
 
        while (!exit_flag) {
                ret = frsh_receive_sync(epdst, msg, rp->budget, &mlen, NULL);
+               if (ret) error(1, errno, "frsh_receive_sync");
                clock_gettime(CLOCK_MONOTONIC, &tsr);
                tss = msg->ts;
                if (msg->cnt != last_cnt+1) {
@@ -433,6 +434,7 @@ void *sender(void *arg)
                        clock_gettime(CLOCK_MONOTONIC, &next_period);
                }
                __sync_fetch_and_add(&stats.sent, 1);
+               if (ret) error(1, errno, "frsh_send_*");
 
                int delay_ms;
                if (p->jitter)
index 1c9d75c1f6ad5477dded131dfe514f2fc4b72f0a..688177cbff232e2600f9846554f35956ba9e8027 100644 (file)
@@ -401,6 +401,7 @@ int recv_packet_fwp(struct stream *stream, struct msg_t *msg)
        size_t mlen;
 
        ret = frsh_receive_sync(stream->resp_endpoint, msg, sizeof(*msg), &mlen, NULL);
+       (unsigned)ret;
        return mlen;
 }
 #endif
@@ -409,13 +410,13 @@ void* receiver(void* arg)
 {
        struct msg_t    msg;
        long long int trans_time_usec, client_to_server_usec, server_to_client_usec;
-       long long int min_trans_time;
+       //long long int min_trans_time;
        struct timespec ts;
        uint64_t send_timestamp, server_timestamp, recv_timestamp;
        int     mlen;
        intptr_t ac;
        
-       min_trans_time = ~0;
+       //min_trans_time = ~0;
        
        block_signals();
        set_rt_prio(99);
@@ -577,7 +578,7 @@ wait_for_next_send(struct stream* stream, struct timespec *last_send_time)
 void* sender(void* arg)
 {
        union msg_buff buff;
-       unsigned long int seqn;
+       //unsigned long int seqn;
        struct stream* stream = (struct stream*) arg;
        struct timespec timer = { 0, 0 }, ts;
        int ret;
@@ -590,7 +591,7 @@ void* sender(void* arg)
        if (stream->bandwidth_bps == 0)
                goto out;
 
-       seqn = 0;
+       //seqn = 0;
        
        block_signals();
        set_rt_prio(90-stream->ac);
index 1b716d2583c97f6075503cd3d216b28eea7b3afd..124e6fc6520aabad082f4eafb1cd631f4dd6dbf7 100644 (file)
@@ -91,7 +91,6 @@ void* qhandler(void* queue)
        union msg_buff buff;
        struct  sockaddr_in rem_addr;
        int     mlen;
-       unsigned int rem_addr_length;
        intptr_t ac;
        char cbufrec[512], cbufsend[512];
        struct iovec  iov;
@@ -100,7 +99,6 @@ void* qhandler(void* queue)
        struct timespec ts;
        
        ac = (intptr_t) queue;
-        rem_addr_length=sizeof(rem_addr);
 
        block_signals();
        set_rt_prio(90-ac);
@@ -183,7 +181,6 @@ void* qhandler(void* queue)
 
 int main(int argc, char *argv[])
 {
-       int rc;
        intptr_t ac;
        pthread_attr_t attr;
        pthread_t thread;
@@ -217,7 +214,7 @@ int main(int argc, char *argv[])
 
        for (ac = 0; ac < AC_NUM; ac++) {
                ac_sockfd[ac] = create_ac_socket(ac);
-               rc = pthread_create(&thread, &attr, qhandler, (void*) ac); 
+               pthread_create(&thread, &attr, qhandler, (void*) ac); 
 
        }
        
index 0f046b2b3567dc522e8c74331e4a167d5228a8e9..c3ec56a0fc44c3a18d4a96c54b478dddc4af8777 100644 (file)
@@ -193,7 +193,7 @@ void *
 gsa_find_indx(gsa_array_t *array, void *key, int *indx)
 {
   if(gsa_bsearch_indx(array,key,array->key_offs,
-                     array->cmp_fnc,GSA_FFIRST,indx))
+                     array->cmp_fnc,GSA_FFIRST,(unsigned*)indx))
     return array->items[*indx];
   else return NULL;
 }
index 9d363ecf2e41c3cb606ae09dff842d76ca52ca84..7c08d542f030ab3532fc54551fcba83ed4776102 100644 (file)
@@ -51,7 +51,7 @@ int ul_hashtab_resize_primitive(ul_hashtab_cust_table_field_t *table_field,
   ul_hashtab_treeroot_t *pt;
   ul_hashtab_treeroot_t *oldtable;
   gavl_node_t *treenode;
-  int res;
+
 
   if(newsize<=0)
     newsize=1;
@@ -79,7 +79,7 @@ int ul_hashtab_resize_primitive(ul_hashtab_cust_table_field_t *table_field,
   while(oldsize--) {
     while(pt->treeroot!=NULL) {
       treenode=gavl_cut_first_primitive(&pt->treeroot);
-      res=ins_fnc(table_field, treenode);
+      ins_fnc(table_field, treenode);
     }
     pt++;
   }