mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

get rid of non portable %lld 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2345 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.8
Stéphane Fillod, F8CFE 2008-05-04 21:16:04 +00:00
rodzic 1f1a363dc6
commit 3d834a4d1f
2 zmienionych plików z 8 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
kenwood/ts140.c
Wyświetl plik

@ -1,8 +1,8 @@
/* /*
* Hamlib Kenwood backend - TS140 description * Hamlib Kenwood backend - TS140 description
* Copyright (c) 2000-2005 by Stephane Fillod * Copyright (c) 2000-2008 by Stephane Fillod
* *
* $Id: ts140.c,v 1.8 2006-04-10 18:01:15 pa4tu Exp $ * $Id: ts140.c,v 1.9 2008-05-04 21:16:04 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -129,7 +129,6 @@ static int ts140_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
char freqbuf[50]; char freqbuf[50];
size_t freq_len; size_t freq_len;
int retval; int retval;
long long f;
/* We're using IF; here because the TS-140S is incapable of supplying /* We're using IF; here because the TS-140S is incapable of supplying
* frequency information in MEM mode with the kenwood_get_freq method. It may * frequency information in MEM mode with the kenwood_get_freq method. It may
@ -147,8 +146,7 @@ static int ts140_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
} }
freqbuf[14] = '\0'; freqbuf[14] = '\0';
sscanf(freqbuf+2, "%lld", &f); /* Is a long long int really necessary here? */ sscanf(freqbuf+2, "%"SCNfreq, freq);
*freq = (freq_t)f;
return RIG_OK; return RIG_OK;
} }
@ -213,7 +211,7 @@ const struct rig_caps ts140_caps = {
.rig_model = RIG_MODEL_TS140S, .rig_model = RIG_MODEL_TS140S,
.model_name = "TS-140S", .model_name = "TS-140S",
.mfg_name = "Kenwood", .mfg_name = "Kenwood",
.version = BACKEND_VER ".0", .version = BACKEND_VER ".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_BETA, .status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,

10
kenwood/ts680.c
Wyświetl plik

@ -1,8 +1,8 @@
/* /*
* Hamlib Kenwood backend - TS680 description * Hamlib Kenwood backend - TS680 description
* Copyright (c) 2000-2005 by Stephane Fillod * Copyright (c) 2000-2008 by Stephane Fillod
* *
* $Id: ts680.c,v 1.7 2006-04-10 18:01:15 pa4tu Exp $ * $Id: ts680.c,v 1.8 2008-05-04 21:16:04 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -128,7 +128,6 @@ static int ts680_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
char freqbuf[50]; char freqbuf[50];
size_t freq_len; size_t freq_len;
int retval; int retval;
long long f;
/* We're using IF; here because the TS-680S is incapable of supplying /* We're using IF; here because the TS-680S is incapable of supplying
* frequency information in MEM mode with the kenwood_get_freq method. It may * frequency information in MEM mode with the kenwood_get_freq method. It may
@ -146,8 +145,7 @@ static int ts680_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
} }
freqbuf[14] = '\0'; freqbuf[14] = '\0';
sscanf(freqbuf+2, "%lld", &f); sscanf(freqbuf+2, "%"SCNfreq, freq);
*freq = (freq_t)f;
return RIG_OK; return RIG_OK;
} }
@ -212,7 +210,7 @@ const struct rig_caps ts680s_caps = {
.rig_model = RIG_MODEL_TS680S, .rig_model = RIG_MODEL_TS680S,
.model_name = "TS-680S", .model_name = "TS-680S",
.mfg_name = "Kenwood", .mfg_name = "Kenwood",
.version = BACKEND_VER ".0", .version = BACKEND_VER ".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_BETA, .status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,