From: Joop S. <pa...@us...> - 2006-03-14 20:07:18
|
Update of /cvsroot/hamlib/hamlib/kenwood In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20598 Modified Files: th.c thg71.c tmv7.c ts140.c ts450s.c ts480.c Log Message: make sure we use ack_len=0 for functions that return nothing (set functions) Index: th.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/kenwood/th.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** th.c 9 Mar 2006 20:12:25 -0000 1.28 --- th.c 14 Mar 2006 20:06:46 -0000 1.29 *************** *** 185,189 **** char freqbuf[ACKBUF_LEN], ackbuf[ACKBUF_LEN]; int retval, step; ! size_t ack_len=ACKBUF_LEN; long long f; --- 185,189 ---- char freqbuf[ACKBUF_LEN], ackbuf[ACKBUF_LEN]; int retval, step; ! size_t ack_len; long long f; *************** *** 198,201 **** --- 198,202 ---- f=(long long) freq; sprintf(freqbuf, "FQ %011"PRIll",%1d"EOM, f, step); + ack_len = 0; retval = kenwood_transaction(rig, freqbuf, strlen(freqbuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 248,252 **** char kmode, mdbuf[24], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len=ACKBUF_LEN; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); --- 249,253 ---- char kmode, mdbuf[24], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); *************** *** 266,269 **** --- 267,271 ---- sprintf(mdbuf, "MD %c" EOM, kmode); + ack_len = 0; retval = kenwood_transaction (rig, mdbuf, strlen(mdbuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 323,327 **** char vfobuf[16], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len=ACKBUF_LEN; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); --- 325,329 ---- char vfobuf[16], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); *************** *** 345,348 **** --- 347,351 ---- } + ack_len = 0; retval = kenwood_transaction(rig, vfobuf, strlen(vfobuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 360,363 **** --- 363,367 ---- } + ack_len = 0; retval = kenwood_transaction(rig, vfobuf, strlen(vfobuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 434,442 **** char trnbuf[16], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len=ACKBUF_LEN; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); sprintf(trnbuf, "AI %c" EOM, (trn == RIG_TRN_RIG) ? '1' : '0'); retval = kenwood_transaction (rig, trnbuf, strlen(trnbuf), ackbuf, &ack_len); if (retval != RIG_OK) --- 438,447 ---- char trnbuf[16], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); sprintf(trnbuf, "AI %c" EOM, (trn == RIG_TRN_RIG) ? '1' : '0'); + ack_len = 0; retval = kenwood_transaction (rig, trnbuf, strlen(trnbuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 540,545 **** char ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len=ACKBUF_LEN; if(status==1) { retval = kenwood_transaction(rig, "TT"EOM, 3, ackbuf, &ack_len); --- 545,551 ---- char ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len; + ack_len = 0; if(status==1) { retval = kenwood_transaction(rig, "TT"EOM, 3, ackbuf, &ack_len); *************** *** 563,567 **** char trbuf[16], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len=ACKBUF_LEN; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); --- 569,573 ---- char trbuf[16], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); *************** *** 570,573 **** --- 576,580 ---- strncat(trbuf,(status)?" 1":" 0",16); strncat(trbuf,EOM,16); + ack_len = 0; retval = kenwood_transaction (rig, cmd, strlen(cmd), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 749,753 **** char vch, lvlbuf[32], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len=ACKBUF_LEN; vfo_t tvfo; --- 756,760 ---- char vch, lvlbuf[32], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len; vfo_t tvfo; *************** *** 769,772 **** --- 776,780 ---- } + ack_len = 0; switch(level) { *************** *** 804,808 **** char tonebuf[16],ackbuf[ACKBUF_LEN]; int i, retval; ! size_t ack_len=ACKBUF_LEN; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); --- 812,816 ---- char tonebuf[16],ackbuf[ACKBUF_LEN]; int i, retval; ! size_t ack_len; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); *************** *** 819,822 **** --- 827,831 ---- i += (i == 0) ? 1 : 2; /* Correct for TH-7DA index anomally */ sprintf(tonebuf, "CTN %02d" EOM, i); + ack_len = 0; retval = kenwood_transaction(rig, tonebuf, strlen(tonebuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 838,841 **** --- 847,851 ---- size_t ack_len=ACKBUF_LEN; unsigned int tone_idx; + rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); *************** *** 897,901 **** char membuf[16], ackbuf[50]; int retval; ! size_t ack_len = 50; vfo_t tvfo; --- 907,911 ---- char membuf[16], ackbuf[50]; int retval; ! size_t ack_len; vfo_t tvfo; *************** *** 922,925 **** --- 932,936 ---- return retval; + ack_len = 0; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 988,992 **** char *membuf, ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len=ACKBUF_LEN; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); --- 999,1003 ---- char *membuf, ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); *************** *** 1002,1006 **** return -RIG_EINVAL; } ! retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) --- 1013,1017 ---- return -RIG_EINVAL; } ! ack_len = 0; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 1013,1018 **** th_set_powerstat(RIG *rig, powerstat_t status) { ! char *membuf; int retval; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); --- 1024,1030 ---- th_set_powerstat(RIG *rig, powerstat_t status) { ! char *membuf, ackbuf[50]; int retval; + size_t ack_len; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); *************** *** 1029,1033 **** } ! retval = kenwood_transaction(rig, membuf, strlen(membuf), NULL, NULL); if (retval != RIG_OK) return retval; --- 1041,1046 ---- } ! ack_len = 0; ! retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) return retval; *************** *** 1107,1111 **** char *membuf,ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len=ACKBUF_LEN; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); --- 1120,1124 ---- char *membuf,ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); *************** *** 1130,1133 **** --- 1143,1147 ---- } + ack_len = 0; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 1333,1337 **** ctcss, tonefq, ctcssfq, (long long)offset); ! ack_len=ACKBUF_LEN; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) --- 1347,1351 ---- ctcss, tonefq, ctcssfq, (long long)offset); ! ack_len = 0; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 1341,1345 **** req[5]='1'; sprintf(membuf, "%s,%011"PRIll",%01d"EOM, req,(long long)chan->tx_freq, step); ! ack_len=ACKBUF_LEN; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) --- 1355,1359 ---- req[5]='1'; sprintf(membuf, "%s,%011"PRIll",%01d"EOM, req,(long long)chan->tx_freq, step); ! ack_len=0; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 1348,1352 **** if(chan->channel_num<200) { ! ack_len=ACKBUF_LEN; sprintf(membuf,"MNA 0,%03d,%s"EOM,chan->channel_num,chan->channel_desc); retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); --- 1362,1366 ---- if(chan->channel_num<200) { ! ack_len=0; sprintf(membuf,"MNA 0,%03d,%s"EOM,chan->channel_num,chan->channel_desc); retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); Index: thg71.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/kenwood/thg71.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** thg71.c 9 Mar 2006 19:51:17 -0000 1.18 --- thg71.c 14 Mar 2006 20:06:46 -0000 1.19 *************** *** 331,335 **** char vfobuf[16], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len=ACKBUF_LEN; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); --- 331,335 ---- char vfobuf[16], ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); *************** *** 348,351 **** --- 348,352 ---- } + ack_len = 0; retval = kenwood_transaction(rig, vfobuf, strlen(vfobuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 388,396 **** char ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len=ACKBUF_LEN; if(func != RIG_FUNC_TBURST) return -RIG_EINVAL; if(status==1) { retval = kenwood_transaction(rig, "TT"EOM, 3, ackbuf, &ack_len); --- 389,398 ---- char ackbuf[ACKBUF_LEN]; int retval; ! size_t ack_len; if(func != RIG_FUNC_TBURST) return -RIG_EINVAL; + ack_len = 0; if(status==1) { retval = kenwood_transaction(rig, "TT"EOM, 3, ackbuf, &ack_len); Index: tmv7.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/kenwood/tmv7.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** tmv7.c 12 Mar 2006 09:02:38 -0000 1.13 --- tmv7.c 14 Mar 2006 20:06:46 -0000 1.14 *************** *** 351,355 **** } ! ack_len=ACKBUF_LEN; retval = kenwood_transaction(rig, vfobuf, strlen(vfobuf), ackbuf, &ack_len); if (retval != RIG_OK) { --- 351,355 ---- } ! ack_len=0; retval = kenwood_transaction(rig, vfobuf, strlen(vfobuf), ackbuf, &ack_len); if (retval != RIG_OK) { *************** *** 374,378 **** rig_debug(RIG_DEBUG_TRACE, "%s: next2\n", __FUNCTION__); ! ack_len=ACKBUF_LEN; retval = kenwood_transaction(rig, vfobuf, strlen(vfobuf), ackbuf, &ack_len); if (retval != RIG_OK) --- 374,378 ---- rig_debug(RIG_DEBUG_TRACE, "%s: next2\n", __FUNCTION__); ! ack_len=0; retval = kenwood_transaction(rig, vfobuf, strlen(vfobuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 630,634 **** ctcss, tonefq, ctcssfq); ! ack_len=ACKBUF_LEN; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) --- 630,634 ---- ctcss, tonefq, ctcssfq); ! ack_len=0; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 638,642 **** req[5]='1'; sprintf(membuf, "%s,%011"PRIll",%01d"EOM, req,(long long)chan->tx_freq, step); ! ack_len=ACKBUF_LEN; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) --- 638,642 ---- req[5]='1'; sprintf(membuf, "%s,%011"PRIll",%01d"EOM, req,(long long)chan->tx_freq, step); ! ack_len=0; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) *************** *** 649,653 **** else sprintf(membuf,"MNA 1,%03d,%s"EOM,chan->channel_num-100,chan->channel_desc); ! ack_len=ACKBUF_LEN; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) --- 649,653 ---- else sprintf(membuf,"MNA 1,%03d,%s"EOM,chan->channel_num-100,chan->channel_desc); ! ack_len=0; retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len); if (retval != RIG_OK) Index: ts140.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/kenwood/ts140.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** ts140.c 12 Mar 2006 09:02:38 -0000 1.6 --- ts140.c 14 Mar 2006 20:06:46 -0000 1.7 *************** *** 104,108 **** char vfo_function; ! ack_len = 50; switch (vfo) { case RIG_VFO_VFO: --- 104,108 ---- char vfo_function; ! ack_len = 0; switch (vfo) { case RIG_VFO_VFO: *************** *** 160,164 **** size_t ack_len; ! ack_len = 50; switch (func) { case RIG_FUNC_LOCK: --- 160,164 ---- size_t ack_len; ! ack_len = 0; switch (func) { case RIG_FUNC_LOCK: Index: ts450s.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/kenwood/ts450s.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** ts450s.c 12 Mar 2006 09:02:38 -0000 1.23 --- ts450s.c 14 Mar 2006 20:06:46 -0000 1.24 *************** *** 214,218 **** int kenwood_val, retval; - ack_len = 50; if (RIG_LEVEL_IS_FLOAT(level)) kenwood_val = val.f * 255; --- 214,217 ---- Index: ts480.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/kenwood/ts480.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** ts480.c 12 Mar 2006 09:02:38 -0000 1.5 --- ts480.c 14 Mar 2006 20:06:46 -0000 1.6 *************** *** 69,73 **** { char ackbuf[50]; ! size_t ack_len = 50; if (RIG_ANT_1 == ant) --- 69,73 ---- { char ackbuf[50]; ! size_t ack_len = 0; if (RIG_ANT_1 == ant) *************** *** 163,167 **** char levelbuf[16], ackbuf[50]; int level_len, retval; ! size_t ack_len = 50; int kenwood_val; --- 163,167 ---- char levelbuf[16], ackbuf[50]; int level_len, retval; ! size_t ack_len; int kenwood_val; |