From 99d401eaec7477698549ab6f85cf25b5aa0e840b Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 8 Feb 2012 00:52:57 +0100 Subject: [PATCH] Get rid of the most of other warnings --- src/forb/forb-idl/forb-idl-c-skels.c | 4 ++-- src/forb/forb-idl/forb-idl-c-stubs.c | 4 ++-- src/forb/forb-idl/forb-idl-driver.c | 2 +- src/frsh/demo/dcamera/camserver.c | 6 +++--- src/frsh/fres/cbroker/fcb.c | 2 +- src/frsh/fres/contract/fres_container.c | 4 ++-- src/frsh/frsh_api/tests/dummy_spare_capacity.c | 17 ++++++++--------- src/frsh/frsh_api/tests/negotiation.c | 16 +++++++--------- src/frsh/resources/disk_bfq/mngr/diskbfq_mngr.c | 4 ++-- src/frsh/resources/item/frm_item.c | 2 +- src/frsh/resources/item/serialsource.c | 5 ----- src/fwp/fwp/lib/fwp/fwp_msgq.c | 6 +++--- .../fwp/lib/fwp/tests/fwp_msgtest/fwp_msgtest.c | 2 -- .../tests/fwp_prototest/fwp_sendrecv_test2.c | 7 +------ src/fwp/fwp/tests/timing/fwp-timing.c | 2 ++ src/fwp/wme_test/wclient.c | 9 +++++---- src/fwp/wme_test/wserver.c | 5 +---- src/ulut/ulut/ul_gsa.c | 2 +- src/ulut/ulut/ul_hashtabprim.c | 4 ++-- 19 files changed, 44 insertions(+), 59 deletions(-) diff --git a/src/forb/forb-idl/forb-idl-c-skels.c b/src/forb/forb-idl/forb-idl-c-skels.c index 1d353381..d0d6971f 100644 --- a/src/forb/forb-idl/forb-idl-c-skels.c +++ b/src/forb/forb-idl/forb-idl-c-skels.c @@ -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; diff --git a/src/forb/forb-idl/forb-idl-c-stubs.c b/src/forb/forb-idl/forb-idl-c-stubs.c index cb4bd17d..b26c0cf1 100644 --- a/src/forb/forb-idl/forb-idl-c-stubs.c +++ b/src/forb/forb-idl/forb-idl-c-stubs.c @@ -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); diff --git a/src/forb/forb-idl/forb-idl-driver.c b/src/forb/forb-idl/forb-idl-driver.c index adc860f4..474f54f3 100644 --- a/src/forb/forb-idl/forb-idl-driver.c +++ b/src/forb/forb-idl/forb-idl-driver.c @@ -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, diff --git a/src/frsh/demo/dcamera/camserver.c b/src/frsh/demo/dcamera/camserver.c index 8e41cd09..996ebf97 100644 --- a/src/frsh/demo/dcamera/camserver.c +++ b/src/frsh/demo/dcamera/camserver.c @@ -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(); diff --git a/src/frsh/fres/cbroker/fcb.c b/src/frsh/fres/cbroker/fcb.c index 0bd1bb46..a1961bfb 100644 --- a/src/frsh/fres/cbroker/fcb.c +++ b/src/frsh/fres/cbroker/fcb.c @@ -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; istate) { diff --git a/src/frsh/frsh_api/tests/dummy_spare_capacity.c b/src/frsh/frsh_api/tests/dummy_spare_capacity.c index aef63858..183de4d8 100644 --- a/src/frsh/frsh_api/tests/dummy_spare_capacity.c +++ b/src/frsh/frsh_api/tests/dummy_spare_capacity.c @@ -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(); } diff --git a/src/frsh/frsh_api/tests/negotiation.c b/src/frsh/frsh_api/tests/negotiation.c index cfdd0b77..7bb6e508 100644 --- a/src/frsh/frsh_api/tests/negotiation.c +++ b/src/frsh/frsh_api/tests/negotiation.c @@ -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(); } diff --git a/src/frsh/resources/disk_bfq/mngr/diskbfq_mngr.c b/src/frsh/resources/disk_bfq/mngr/diskbfq_mngr.c index 5e0379b0..545774e2 100644 --- a/src/frsh/resources/disk_bfq/mngr/diskbfq_mngr.c +++ b/src/frsh/resources/disk_bfq/mngr/diskbfq_mngr.c @@ -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); diff --git a/src/frsh/resources/item/frm_item.c b/src/frsh/resources/item/frm_item.c index 6ab2ee23..95743332 100644 --- a/src/frsh/resources/item/frm_item.c +++ b/src/frsh/resources/item/frm_item.c @@ -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); diff --git a/src/frsh/resources/item/serialsource.c b/src/frsh/resources/item/serialsource.c index 6c1b8882..ec6b2263 100644 --- a/src/frsh/resources/item/serialsource.c +++ b/src/frsh/resources/item/serialsource.c @@ -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); diff --git a/src/fwp/fwp/lib/fwp/fwp_msgq.c b/src/fwp/fwp/lib/fwp/fwp_msgq.c index 1af89bdf..443aec04 100644 --- a/src/fwp/fwp/lib/fwp/fwp_msgq.c +++ b/src/fwp/fwp/lib/fwp/fwp_msgq.c @@ -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); } diff --git a/src/fwp/fwp/lib/fwp/tests/fwp_msgtest/fwp_msgtest.c b/src/fwp/fwp/lib/fwp/tests/fwp_msgtest/fwp_msgtest.c index ff1877c4..d6f1c974 100644 --- a/src/fwp/fwp/lib/fwp/tests/fwp_msgtest/fwp_msgtest.c +++ b/src/fwp/fwp/lib/fwp/tests/fwp_msgtest/fwp_msgtest.c @@ -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); diff --git a/src/fwp/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test2.c b/src/fwp/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test2.c index c42de6a0..ac57b266 100644 --- a/src/fwp/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test2.c +++ b/src/fwp/fwp/lib/fwp/tests/fwp_prototest/fwp_sendrecv_test2.c @@ -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"); diff --git a/src/fwp/fwp/tests/timing/fwp-timing.c b/src/fwp/fwp/tests/timing/fwp-timing.c index 4ed0c284..b465bce8 100644 --- a/src/fwp/fwp/tests/timing/fwp-timing.c +++ b/src/fwp/fwp/tests/timing/fwp-timing.c @@ -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) diff --git a/src/fwp/wme_test/wclient.c b/src/fwp/wme_test/wclient.c index 1c9d75c1..688177cb 100644 --- a/src/fwp/wme_test/wclient.c +++ b/src/fwp/wme_test/wclient.c @@ -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); diff --git a/src/fwp/wme_test/wserver.c b/src/fwp/wme_test/wserver.c index 1b716d25..124e6fc6 100644 --- a/src/fwp/wme_test/wserver.c +++ b/src/fwp/wme_test/wserver.c @@ -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); } diff --git a/src/ulut/ulut/ul_gsa.c b/src/ulut/ulut/ul_gsa.c index 0f046b2b..c3ec56a0 100644 --- a/src/ulut/ulut/ul_gsa.c +++ b/src/ulut/ulut/ul_gsa.c @@ -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; } diff --git a/src/ulut/ulut/ul_hashtabprim.c b/src/ulut/ulut/ul_hashtabprim.c index 9d363ecf..7c08d542 100644 --- a/src/ulut/ulut/ul_hashtabprim.c +++ b/src/ulut/ulut/ul_hashtabprim.c @@ -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++; } -- 2.39.2