Skip to content

Commit d6dcd4a

Browse files
GeoBaltzGeoBaltz
committed
And another batch...
All sed -i with some manual fixups. Less than 2000 to go.
1 parent 9e4bacb commit d6dcd4a

File tree

11 files changed

+108
-108
lines changed

11 files changed

+108
-108
lines changed

‎rigs/pcr/pcr.c‎

Lines changed: 49 additions & 49 deletions
Large diffs are not rendered by default.

‎rigs/prm80/prm80.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ MessageAide: DB "H",0Dh,0Ah
140140

141141
static void prm80_force_cache_timeout(RIG *rig)
142142
{
143-
struct prm80_priv_data *priv = (struct prm80_priv_data *)rig->state.priv;
143+
struct prm80_priv_data *priv = (struct prm80_priv_data *)STATE(rig)->priv;
144144

145145
rig_force_cache_timeout(&priv->status_tv);
146146
}
@@ -283,9 +283,9 @@ int prm80_init(RIG *rig)
283283
return -RIG_EINVAL;
284284
}
285285

286-
rig->state.priv = (void *)calloc(1, sizeof(struct prm80_priv_data));
286+
STATE(rig)->priv = (void *)calloc(1, sizeof(struct prm80_priv_data));
287287

288-
if (!rig->state.priv)
288+
if (!STATE(rig)->priv)
289289
{
290290
/* whoops! memory shortage! */
291291
return -RIG_ENOMEM;
@@ -301,8 +301,8 @@ int prm80_cleanup(RIG *rig)
301301
return -RIG_EINVAL;
302302
}
303303

304-
free(rig->state.priv);
305-
rig->state.priv = NULL;
304+
free(STATE(rig)->priv);
305+
STATE(rig)->priv = NULL;
306306

307307
return RIG_OK;
308308
}
@@ -418,7 +418,7 @@ int prm80_set_rx_tx_freq(RIG *rig, freq_t rx_freq, freq_t tx_freq)
418418
*/
419419
int prm80_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
420420
{
421-
struct prm80_priv_data *priv = (struct prm80_priv_data *)rig->state.priv;
421+
struct prm80_priv_data *priv = (struct prm80_priv_data *)STATE(rig)->priv;
422422
freq_t tx_freq;
423423
int rc;
424424

@@ -448,7 +448,7 @@ int prm80_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
448448
*/
449449
int prm80_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
450450
{
451-
struct prm80_priv_data *priv = (struct prm80_priv_data *)rig->state.priv;
451+
struct prm80_priv_data *priv = (struct prm80_priv_data *)STATE(rig)->priv;
452452
freq_t rx_freq;
453453
int rc;
454454

@@ -471,7 +471,7 @@ int prm80_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
471471
*/
472472
int prm80_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
473473
{
474-
struct prm80_priv_data *priv = (struct prm80_priv_data *)rig->state.priv;
474+
struct prm80_priv_data *priv = (struct prm80_priv_data *)STATE(rig)->priv;
475475
int ret;
476476
channel_t chan;
477477

@@ -498,7 +498,7 @@ int prm80_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
498498
*/
499499
int prm80_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
500500
{
501-
struct prm80_priv_data *priv = (struct prm80_priv_data *)rig->state.priv;
501+
struct prm80_priv_data *priv = (struct prm80_priv_data *)STATE(rig)->priv;
502502

503503
priv->split = split;
504504

@@ -510,7 +510,7 @@ int prm80_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
510510
*/
511511
int prm80_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
512512
{
513-
const struct prm80_priv_data *priv = (struct prm80_priv_data *)rig->state.priv;
513+
const struct prm80_priv_data *priv = (struct prm80_priv_data *)STATE(rig)->priv;
514514

515515
*split = priv->split;
516516
*tx_vfo = RIG_VFO_CURR;
@@ -523,7 +523,7 @@ int prm80_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
523523
*/
524524
int prm80_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
525525
{
526-
struct prm80_priv_data *priv = (struct prm80_priv_data *)rig->state.priv;
526+
struct prm80_priv_data *priv = (struct prm80_priv_data *)STATE(rig)->priv;
527527
int ret;
528528
channel_t chan;
529529

@@ -694,7 +694,7 @@ static int prm80_do_read_system_state(hamlib_port_t *rigport, char *statebuf)
694694
*/
695695
static int prm80_read_system_state(RIG *rig, char *statebuf)
696696
{
697-
struct prm80_priv_data *priv = (struct prm80_priv_data *)rig->state.priv;
697+
struct prm80_priv_data *priv = (struct prm80_priv_data *)STATE(rig)->priv;
698698
int ret = RIG_OK;
699699

700700
if (rig_check_cache_timeout(&priv->status_tv, PRM80_CACHE_TIMEOUT))
@@ -723,7 +723,7 @@ static int prm80_read_system_state(RIG *rig, char *statebuf)
723723
*/
724724
int prm80_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
725725
{
726-
const struct prm80_priv_data *priv = (struct prm80_priv_data *)rig->state.priv;
726+
const struct prm80_priv_data *priv = (struct prm80_priv_data *)STATE(rig)->priv;
727727
char statebuf[BUFSZ];
728728
int ret, chanstate, mode_byte, lock_byte;
729729

@@ -821,7 +821,7 @@ int prm80_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
821821
*/
822822
int prm80_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan)
823823
{
824-
struct prm80_priv_data *priv = (struct prm80_priv_data *)rig->state.priv;
824+
struct prm80_priv_data *priv = (struct prm80_priv_data *)STATE(rig)->priv;
825825
hamlib_port_t *rp = RIGPORT(rig);
826826
char buf[BUFSZ];
827827
int ret, chanstate;
@@ -1107,7 +1107,7 @@ int prm80_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
11071107
static int prm80_get_rawstr_RAM(RIG *rig, value_t *val)
11081108
{
11091109
char buf[BUFSZ];
1110-
struct rig_state *rs = &rig->state;
1110+
struct rig_state *rs = STATE(rig);
11111111
hamlib_port_t *rp = RIGPORT(rig);
11121112
int ret, i;
11131113

‎rigs/racal/ra37xx.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static int ra37xx_one_transaction(RIG *rig, const char *cmd, char *data,
6969
int *data_len)
7070
{
7171
const struct ra37xx_priv_data *priv = (struct ra37xx_priv_data *)
72-
rig->state.priv;
72+
STATE(rig)->priv;
7373
hamlib_port_t *rp = RIGPORT(rig);
7474
char cmdbuf[BUFSZ];
7575
char respbuf[BUFSZ];
@@ -215,16 +215,16 @@ int ra37xx_init(RIG *rig)
215215
return -RIG_EINVAL;
216216
}
217217

218-
rig->state.priv = (struct ra37xx_priv_data *)calloc(1, sizeof(
218+
STATE(rig)->priv = (struct ra37xx_priv_data *)calloc(1, sizeof(
219219
struct ra37xx_priv_data));
220220

221-
if (!rig->state.priv)
221+
if (!STATE(rig)->priv)
222222
{
223223
/* whoops! memory shortage! */
224224
return -RIG_ENOMEM;
225225
}
226226

227-
priv = rig->state.priv;
227+
priv = STATE(rig)->priv;
228228

229229
priv->receiver_id = -1;
230230

@@ -240,22 +240,22 @@ int ra37xx_cleanup(RIG *rig)
240240
return -RIG_EINVAL;
241241
}
242242

243-
if (rig->state.priv)
243+
if (STATE(rig)->priv)
244244
{
245-
free(rig->state.priv);
245+
free(STATE(rig)->priv);
246246
}
247247

248-
rig->state.priv = NULL;
248+
STATE(rig)->priv = NULL;
249249

250250
return RIG_OK;
251251
}
252252

253253
/*
254-
* Assumes rig!=NULL, rig->state.priv!=NULL
254+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
255255
*/
256256
int ra37xx_set_conf2(RIG *rig, hamlib_token_t token, const char *val, int val_len)
257257
{
258-
struct ra37xx_priv_data *priv = (struct ra37xx_priv_data *)rig->state.priv;
258+
struct ra37xx_priv_data *priv = (struct ra37xx_priv_data *)STATE(rig)->priv;
259259
int receiver_id;
260260

261261
switch (token)
@@ -285,13 +285,13 @@ int ra37xx_set_conf(RIG *rig, hamlib_token_t token, const char *val)
285285

286286
/*
287287
* assumes rig!=NULL,
288-
* Assumes rig!=NULL, rig->state.priv!=NULL
288+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
289289
* and val points to a buffer big enough to hold the conf value.
290290
*/
291291
int ra37xx_get_conf2(RIG *rig, hamlib_token_t token, char *val, int val_len)
292292
{
293293
const struct ra37xx_priv_data *priv = (struct ra37xx_priv_data *)
294-
rig->state.priv;
294+
STATE(rig)->priv;
295295

296296
switch (token)
297297
{
@@ -371,7 +371,7 @@ int ra37xx_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
371371
*/
372372
int ra37xx_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
373373
{
374-
//struct ra37xx_priv_data *priv = (struct ra37xx_priv_data*)rig->state.priv;
374+
//struct ra37xx_priv_data *priv = (struct ra37xx_priv_data*)STATE(rig)->priv;
375375
int ra_mode, widthtype, widthnum = 0;
376376
char buf[BUFSZ];
377377

@@ -631,7 +631,7 @@ int ra37xx_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
631631
}
632632

633633
sscanf(resbuf + 5, "%d", &i);
634-
val->i = i ? rig->state.preamp[0] : 0;
634+
val->i = i ? STATE(rig)->preamp[0] : 0;
635635
break;
636636

637637
case RIG_LEVEL_RAWSTR:

‎rigs/racal/racal.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ const struct confparams racal_cfg_params[] =
6161

6262
/*
6363
* racal_transaction
64-
* We assume that rig!=NULL, rig->state!= NULL
64+
* We assume that rig!=NULL, RIGPORT(rig)!= NULL
6565
*
6666
* TODO: Status Response handling with G/T commands
6767
*/
6868
static int racal_transaction(RIG *rig, const char *cmd, char *data,
6969
int *data_len)
7070
{
71-
const struct racal_priv_data *priv = (struct racal_priv_data *)rig->state.priv;
71+
const struct racal_priv_data *priv = (struct racal_priv_data *)STATE(rig)->priv;
7272
hamlib_port_t *rp = RIGPORT(rig);
7373
char cmdbuf[BUFSZ + 1];
7474
int retval;
@@ -120,16 +120,16 @@ int racal_init(RIG *rig)
120120
return -RIG_EINVAL;
121121
}
122122

123-
rig->state.priv = (struct racal_priv_data *)calloc(1, sizeof(
123+
STATE(rig)->priv = (struct racal_priv_data *)calloc(1, sizeof(
124124
struct racal_priv_data));
125125

126-
if (!rig->state.priv)
126+
if (!STATE(rig)->priv)
127127
{
128128
/* whoops! memory shortage! */
129129
return -RIG_ENOMEM;
130130
}
131131

132-
priv = rig->state.priv;
132+
priv = STATE(rig)->priv;
133133

134134
priv->receiver_id = 0;
135135
priv->bfo = 0;
@@ -147,24 +147,24 @@ int racal_cleanup(RIG *rig)
147147
return -RIG_EINVAL;
148148
}
149149

150-
if (rig->state.priv)
150+
if (STATE(rig)->priv)
151151
{
152-
free(rig->state.priv);
152+
free(STATE(rig)->priv);
153153
}
154154

155-
rig->state.priv = NULL;
155+
STATE(rig)->priv = NULL;
156156

157157
return RIG_OK;
158158
}
159159

160160

161161

162162
/*
163-
* Assumes rig!=NULL, rig->state.priv!=NULL
163+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
164164
*/
165165
int racal_set_conf(RIG *rig, hamlib_token_t token, const char *val)
166166
{
167-
struct racal_priv_data *priv = (struct racal_priv_data *)rig->state.priv;
167+
struct racal_priv_data *priv = (struct racal_priv_data *)STATE(rig)->priv;
168168

169169
switch (token)
170170
{
@@ -181,12 +181,12 @@ int racal_set_conf(RIG *rig, hamlib_token_t token, const char *val)
181181

182182
/*
183183
* assumes rig!=NULL,
184-
* Assumes rig!=NULL, rig->state.priv!=NULL
184+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
185185
* and val points to a buffer big enough to hold the conf value.
186186
*/
187187
int racal_get_conf2(RIG *rig, hamlib_token_t token, char *val, int val_len)
188188
{
189-
const struct racal_priv_data *priv = (struct racal_priv_data *)rig->state.priv;
189+
const struct racal_priv_data *priv = (struct racal_priv_data *)STATE(rig)->priv;
190190

191191
switch (token)
192192
{
@@ -275,7 +275,7 @@ int racal_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
275275
*/
276276
int racal_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
277277
{
278-
const struct racal_priv_data *priv = (struct racal_priv_data *)rig->state.priv;
278+
const struct racal_priv_data *priv = (struct racal_priv_data *)STATE(rig)->priv;
279279
int ra_mode;
280280
char buf[BUFSZ];
281281

@@ -371,7 +371,7 @@ int racal_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
371371
*/
372372
int racal_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
373373
{
374-
struct racal_priv_data *priv = (struct racal_priv_data *)rig->state.priv;
374+
struct racal_priv_data *priv = (struct racal_priv_data *)STATE(rig)->priv;
375375
char cmdbuf[BUFSZ];
376376
int agc;
377377

@@ -427,7 +427,7 @@ int racal_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
427427
*/
428428
int racal_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
429429
{
430-
struct racal_priv_data *priv = (struct racal_priv_data *)rig->state.priv;
430+
struct racal_priv_data *priv = (struct racal_priv_data *)STATE(rig)->priv;
431431
char resbuf[BUFSZ];
432432
int retval, len, att;
433433
double f;
@@ -510,7 +510,7 @@ int racal_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
510510
}
511511

512512
/*
513-
* Assumes rig!=NULL, rig->state.priv!=NULL
513+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
514514
*/
515515
int racal_reset(RIG *rig, reset_t reset)
516516
{

‎rigs/rft/rft.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
/*
3838
* rft_transaction
39-
* We assume that rig!=NULL, rig->state!= NULL, data!=NULL, data_len!=NULL
39+
* We assume that rig!=NULL, RIGPORT(rig)!= NULL, data!=NULL, data_len!=NULL
4040
*/
4141
int rft_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
4242
int *data_len)

‎rigs/rs/ek89x.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
/*
4949
* ek89x
50-
* We assume that rig!=NULL, rig->state!= NULL, data!=NULL, data_len!=NULL
50+
* We assume that rig!=NULL, STATE(rig)!= NULL, data!=NULL, data_len!=NULL
5151
*/
5252
int
5353
ek89x_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,

‎rigs/rs/gp2000.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
/*
5454
* gp2000
55-
* We assume that rig!=NULL, rig->state!= NULL, data!=NULL, data_len!=NULL
55+
* We assume that rig!=NULL, STATE(rig)!= NULL, data!=NULL, data_len!=NULL
5656
*/
5757
int
5858
gp2000_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,

‎rigs/rs/rs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
/*
5252
* rs_transaction
53-
* We assume that rig!=NULL, rig->state!= NULL, data!=NULL, data_len!=NULL
53+
* We assume that rig!=NULL, STATE(rig)!= NULL, data!=NULL, data_len!=NULL
5454
*/
5555
int rs_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
5656
int *data_len)
@@ -334,7 +334,7 @@ int rs_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
334334

335335
case RIG_LEVEL_ATT:
336336
val->i = (!memcmp(buf, "ON", 2)
337-
|| !memcmp(buf, "1", 1)) ? rig->state.attenuator[0] : 0;
337+
|| !memcmp(buf, "1", 1)) ? STATE(rig)->attenuator[0] : 0;
338338
break;
339339

340340
case RIG_LEVEL_AF:

‎rigs/skanti/skanti.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
/*
5353
* skanti_transaction
54-
* We assume that rig!=NULL, rig->state!= NULL, data!=NULL, data_len!=NULL
54+
* We assume that rig!=NULL, STATE(rig)!= NULL, data!=NULL, data_len!=NULL
5555
* Otherwise, you'll get a nice seg fault. You've been warned!
5656
* TODO: error case handling
5757
*/

0 commit comments

Comments
 (0)