Skip to content

Remove redundant function extern declarations #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ourairquality wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove redundant function extern declarations #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/consapp/convbin/convbin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static void printhelp(void)
exit(0);
}
/* show message --------------------------------------------------------------*/
extern int showmsg(const char *format, ...)
int showmsg(const char *format, ...)
{
va_list arg;
va_start(arg,format); vfprintf(stderr,format,arg); va_end(arg);
Expand Down
6 changes: 3 additions & 3 deletions app/consapp/rnx2rtkp/rnx2rtkp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ static const char *help[]={
" --version display release version"
};
/* show message --------------------------------------------------------------*/
extern int showmsg(const char *format, ...)
int showmsg(const char *format, ...)
{
va_list arg;
va_start(arg,format); vfprintf(stderr,format,arg); va_end(arg);
fprintf(stderr,"\r");
return 0;
}
extern void settspan(gtime_t ts, gtime_t te) {}
extern void settime(gtime_t time) {}
void settspan(gtime_t ts, gtime_t te) {}
void settime(gtime_t time) {}

/* print help ----------------------------------------------------------------*/
static void printhelp(void)
Expand Down
20 changes: 10 additions & 10 deletions app/consapp/rtkrcv/vt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
* char *dev I device ("": standard tty)
* return : virtual console (NULL: error)
*-----------------------------------------------------------------------------*/
extern vt_t *vt_open(int sock, const char *dev)
vt_t *vt_open(int sock, const char *dev)
{
const char mode[]={C_IAC,C_WILL,C_SUPPGA,C_IAC,C_WILL,C_ECHO};
struct termios tio={0};
Expand Down Expand Up @@ -101,7 +101,7 @@ extern vt_t *vt_open(int sock, const char *dev)
* args : vt_t *vt I virtual console
* return : none
*-----------------------------------------------------------------------------*/
extern void vt_close(vt_t *vt)
void vt_close(vt_t *vt)
{
int i;

Expand Down Expand Up @@ -258,7 +258,7 @@ static int seq_esc(vt_t *vt)
* return : status (1:ok,0:error)
* notes : if no input, return ok with *c='\0'
*-----------------------------------------------------------------------------*/
extern int vt_getc(vt_t *vt, char *c)
int vt_getc(vt_t *vt, char *c)
{
struct timeval tv={0,1000}; /* timeout (us) */
fd_set rs;
Expand Down Expand Up @@ -305,7 +305,7 @@ extern int vt_getc(vt_t *vt, char *c)
* in n I buffer size
* return : status (1:ok,0:no input)
*-----------------------------------------------------------------------------*/
extern int vt_gets(vt_t *vt, char *buff, int n)
int vt_gets(vt_t *vt, char *buff, int n)
{
char c;

Expand Down Expand Up @@ -347,7 +347,7 @@ static int vt_putchar(vt_t *vt, char c)
* char c I character
* return : status (1:ok,0:error)
*-----------------------------------------------------------------------------*/
extern int vt_putc(vt_t *vt, char c)
int vt_putc(vt_t *vt, char c)
{
if (c=='\n'&&!vt_putchar(vt,'\r')) return 0;
return vt_putchar(vt,c);
Expand All @@ -358,7 +358,7 @@ extern int vt_putc(vt_t *vt, char c)
* char *buff I strings
* return : status (1:ok,0:error)
*-----------------------------------------------------------------------------*/
extern int vt_puts(vt_t *vt, const char *buff)
int vt_puts(vt_t *vt, const char *buff)
{
const char *p;
for (p=buff;*p;p++) if (!vt_putc(vt,*p)) return 0;
Expand All @@ -371,7 +371,7 @@ extern int vt_puts(vt_t *vt, const char *buff)
* ... I variable arguments
* return : status (1:ok,0:error)
*-----------------------------------------------------------------------------*/
extern int vt_printf(vt_t *vt, const char *format, ...)
int vt_printf(vt_t *vt, const char *format, ...)
{
va_list ap;
char buff[MAXBUFF+1];
Expand All @@ -385,7 +385,7 @@ extern int vt_printf(vt_t *vt, const char *format, ...)
* args : vt_t *vt I virtual console
* return : status (1:break,0:no break)
*-----------------------------------------------------------------------------*/
extern int vt_chkbrk(vt_t *vt)
int vt_chkbrk(vt_t *vt)
{
char c;
vt->brk=0;
Expand All @@ -397,7 +397,7 @@ extern int vt_chkbrk(vt_t *vt)
* char *file I log file path
* return : status (1:ok,0:error)
*-----------------------------------------------------------------------------*/
extern int vt_openlog(vt_t *vt, const char *file)
int vt_openlog(vt_t *vt, const char *file)
{
if (!vt||!vt->state||!(vt->logfp=fopen(file,"w"))) return 0;
return 1;
Expand All @@ -407,7 +407,7 @@ extern int vt_openlog(vt_t *vt, const char *file)
* args : vt_t *vt I virtual console
* return : none
*-----------------------------------------------------------------------------*/
extern void vt_closelog(vt_t *vt)
void vt_closelog(vt_t *vt)
{
if (!vt||!vt->state||!vt->logfp) return;
fclose(vt->logfp);
Expand Down
6 changes: 3 additions & 3 deletions app/qtapp/rtkconv_qt/convmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static int abortf = 0;

// show message in message area ---------------------------------------------
extern "C" {
extern int showmsg(const char *format, ...)
int showmsg(const char *format, ...)
{
va_list arg;
char buff[1024];
Expand All @@ -75,8 +75,8 @@ extern "C" {

return abortf;
}
extern void settime(gtime_t) {}
extern void settspan(gtime_t, gtime_t) {}
void settime(gtime_t) {}
void settspan(gtime_t, gtime_t) {}
}

// constructor --------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion app/qtapp/rtkget_qt/getmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ MainForm *mainForm;

// show message in message area ---------------------------------------------
extern "C" {
extern int showmsg(const char *format, ...)
int showmsg(const char *format, ...)
{
va_list arg;
QString str;
Expand Down
6 changes: 3 additions & 3 deletions app/qtapp/rtknavi_qt/navimain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ static int strfmt[] = { /* stream formats */

// show message in message area ---------------------------------------------
extern "C" {
extern int showmsg(const char *, ...)
int showmsg(const char *, ...)
{
return 0;
}
extern void settime(gtime_t) {}
extern void settspan(gtime_t, gtime_t) {}
void settime(gtime_t) {}
void settspan(gtime_t, gtime_t) {}
}

// constructor --------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions app/qtapp/rtkplot_qt/plotmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
#define qMaxSHAPEFILE 16 // max number of shape files

extern "C" {
extern void settime(gtime_t) {}
extern void settspan(gtime_t, gtime_t) {}
void settime(gtime_t) {}
void settspan(gtime_t, gtime_t) {}
}


Expand Down
6 changes: 3 additions & 3 deletions app/qtapp/rtkpost_qt/postmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ MainForm *mainForm;
extern "C" {

// show message in message area ---------------------------------------------
extern int showmsg(const char *format, ...)
int showmsg(const char *format, ...)
{
va_list arg;
char buff[1024];
Expand All @@ -93,13 +93,13 @@ extern int showmsg(const char *format, ...)
return mainForm->abortFlag;
}
// set time span of progress bar --------------------------------------------
extern void settspan(gtime_t ts, gtime_t te)
void settspan(gtime_t ts, gtime_t te)
{
tstart_ = ts;
tend_ = te;
}
// set current time to show progress ----------------------------------------
extern void settime(gtime_t time)
void settime(gtime_t time)
{
double tt;
if (tend_.time != 0 && tstart_.time != 0 && (tt = timediff(tend_, tstart_)) > 0.0) {
Expand Down
6 changes: 3 additions & 3 deletions app/qtapp/srctblbrows_qt/browsmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ static char buff[MAXSRCTBL]; // source table buffer
MainForm *mainForm;

extern "C" {
extern int showmsg(const char *, ...) {return 0;}
extern void settime(gtime_t) {}
extern void settspan(gtime_t, gtime_t) {}
int showmsg(const char *, ...) {return 0;}
void settime(gtime_t) {}
void settspan(gtime_t, gtime_t) {}
}

/* get source table -------------------------------------------------------*/
Expand Down
6 changes: 3 additions & 3 deletions app/qtapp/strsvr_qt/svrmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
strsvr_t strsvr;

extern "C" {
extern int showmsg(const char *, ...) {return 0;}
extern void settime(gtime_t) {}
extern void settspan(gtime_t, gtime_t) {}
int showmsg(const char *, ...) {return 0;}
void settime(gtime_t) {}
void settspan(gtime_t, gtime_t) {}
}


Expand Down
2 changes: 1 addition & 1 deletion app/winapp/rtkconv/convmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static int abortf=0;

// show message in message area ---------------------------------------------
extern "C" {
extern int showmsg(const char *format,...)
int showmsg(const char *format,...)
{
static int i=0;
va_list arg;
Expand Down
2 changes: 1 addition & 1 deletion app/winapp/rtkget/getmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static int abortf=0; // abort flag

// show message in message area ---------------------------------------------
extern "C" {
extern int showmsg(const char *format,...)
int showmsg(const char *format,...)
{
va_list arg;
AnsiString str;
Expand Down
2 changes: 1 addition & 1 deletion app/winapp/rtknavi/navimain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ stream_t monistr; // monitor stream

// show message in message area ---------------------------------------------
extern "C" {
extern int showmsg(const char *format,...) {return 0;}
int showmsg(const char *format,...) {return 0;}
}
// convert degree to deg-min-sec --------------------------------------------
static void degtodms(double deg, double *dms)
Expand Down
6 changes: 3 additions & 3 deletions app/winapp/rtkpost/postmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static char base_[256]=""; // base-station name
extern "C" {

// show message in message area ---------------------------------------------
extern int showmsg(const char *format, ...)
int showmsg(const char *format, ...)
{
va_list arg;
char buff[1024];
Expand All @@ -78,13 +78,13 @@ extern int showmsg(const char *format, ...)
return MainForm->AbortFlag;
}
// set time span of progress bar --------------------------------------------
extern void settspan(gtime_t ts, gtime_t te)
void settspan(gtime_t ts, gtime_t te)
{
tstart_=ts;
tend_ =te;
}
// set current time to show progress ----------------------------------------
extern void settime(gtime_t time)
void settime(gtime_t time)
{
static int i=0;
double tt;
Expand Down
2 changes: 1 addition & 1 deletion src/convgpx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ static int savegpx(const char *file, const solbuf_t *solbuf, const char *name,
* int outtime I output time (0:off,1:gpst,2:utc,3:jst)
* return : status (0:ok,-1:file read,-2:file format,-3:no data,-4:file write)
*-----------------------------------------------------------------------------*/
extern int convgpx(const char *infile, const char *outfile, gtime_t ts,
int convgpx(const char *infile, const char *outfile, gtime_t ts,
gtime_t te, double tint, int qflg, int mean, const char *name,
double *offset, int outtrk, int outpnt, int outalt, int outtime)
{
Expand Down
4 changes: 2 additions & 2 deletions src/convkml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static int savekml(const char *file, const solbuf_t *solbuf, const char *name,
* return : status (0:ok,-1:file read,-2:file format,-3:no data,-4:file write)
* notes : see ref [1] for google earth kml file format
*-----------------------------------------------------------------------------*/
extern int convkml(const char *infile, const char *outfile, gtime_t ts,
int convkml(const char *infile, const char *outfile, gtime_t ts,
gtime_t te, double tint, int qflg, int mean, const char *name,
double *offset, int tcolor, int pcolor, int outalt, int outtime)
{
Expand Down Expand Up @@ -277,7 +277,7 @@ static int savecsv(const char *file, const solbuf_t *solbuf, const char *name,
// int outorder I output order (0:lat/lon,1:lon/lat)
// Return : status (0:ok,-1:file read,-2:file format,-3:no data,-4:file write)
//------------------------------------------------------------------------------
extern int convcsv(const char *infile, const char *outfile, gtime_t ts, gtime_t te, double tint,
int convcsv(const char *infile, const char *outfile, gtime_t ts, gtime_t te, double tint,
int qflg, int mean, const char *name, double *offset,
int outalt, int outtime, int outorder) {
trace(3, "convcsv : infile=%s outfile=%s\n", infile, outfile);
Expand Down
2 changes: 1 addition & 1 deletion src/convrnx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,7 +1462,7 @@ static int convrnx_s(int sess, int format, rnxopt_t *opt, const char *file,
* station ID (%r)
* the order of wild-card expanded files must be in-order by time
*-----------------------------------------------------------------------------*/
extern int convrnx(int format, rnxopt_t *opt, const char *file, char **ofile)
int convrnx(int format, rnxopt_t *opt, const char *file, char **ofile)
{
gtime_t t0={0};
rnxopt_t opt_=*opt;
Expand Down
6 changes: 3 additions & 3 deletions src/datum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static int dlatdlon(const double *post, double *dpos)
* return : status (0:ok,0>:error)
* notes : parameters file shall comply with GSI TKY2JGD.par
*-----------------------------------------------------------------------------*/
extern int loaddatump(const char *file)
int loaddatump(const char *file)
{
FILE *fp;
char buff[256];
Expand Down Expand Up @@ -97,7 +97,7 @@ extern int loaddatump(const char *file)
* return : status (0:ok,0>:error,out of range)
* notes : before calling, call loaddatump() to set parameter table
*-----------------------------------------------------------------------------*/
extern int tokyo2jgd(double *pos)
int tokyo2jgd(double *pos)
{
double post[2],dpos[2];

Expand All @@ -115,7 +115,7 @@ extern int tokyo2jgd(double *pos)
* return : status (0:ok,0>:error,out of range)
* notes : before calling, call loaddatump() to set parameter table
*-----------------------------------------------------------------------------*/
extern int jgd2tokyo(double *pos)
int jgd2tokyo(double *pos)
{
double posj[2],dpos[2];
int i;
Expand Down
10 changes: 5 additions & 5 deletions src/download.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ typedef struct { /* download paths type */
} paths_t;

/* execute command with test timeout -----------------------------------------*/
extern int execcmd_to(const char *cmd)
int execcmd_to(const char *cmd)
{
#ifdef WIN32
PROCESS_INFORMATION info;
Expand Down Expand Up @@ -672,7 +672,7 @@ static int print_total(const url_t *url, const char **stas, int nsta, int *nc,
* %r -> rrrr : station name
* %{env} -> env : environment variable
*-----------------------------------------------------------------------------*/
extern int dl_readurls(const char *file, const char **types, int ntype, url_t *urls,
int dl_readurls(const char *file, const char **types, int ntype, url_t *urls,
int nmax)
{
FILE *fp;
Expand Down Expand Up @@ -716,7 +716,7 @@ extern int dl_readurls(const char *file, const char **types, int ntype, url_t *u
* (1) station list file contains station names separated by spaces.
* (2) strings after # in a line are treated as comments
*-----------------------------------------------------------------------------*/
extern int dl_readstas(const char *file, char **stas, int nmax)
int dl_readstas(const char *file, char **stas, int nmax)
{
FILE *fp;
char buff[4096],*p;
Expand Down Expand Up @@ -772,7 +772,7 @@ extern int dl_readstas(const char *file, char **stas, int nmax)
* remote file-list. The secondary matched or the following files are
* not downloaded.
*-----------------------------------------------------------------------------*/
extern int dl_exec(gtime_t ts, gtime_t te, double ti, int seqnos, int seqnoe,
int dl_exec(gtime_t ts, gtime_t te, double ti, int seqnos, int seqnoe,
const url_t *urls, int nurl, const char **stas, int nsta,
const char *dir, const char *usr, const char *pwd,
const char *proxy, int opts, char *msg, FILE *fp)
Expand Down Expand Up @@ -839,7 +839,7 @@ extern int dl_exec(gtime_t ts, gtime_t te, double ti, int seqnos, int seqnoe,
* FILE *fp IO log test result file pointer
* return : status (1:ok,0:error,-1:aborted)
*-----------------------------------------------------------------------------*/
extern void dl_test(gtime_t ts, gtime_t te, double ti, const url_t *urls,
void dl_test(gtime_t ts, gtime_t te, double ti, const url_t *urls,
int nurl, const char **stas, int nsta, const char *dir,
int ncol, int datefmt, FILE *fp)
{
Expand Down
Loading