Skip to content

Commit 319f440

Browse files
ourairqualityourairquality
committed
Remove redundant function extern declarations
Functions are extern by default.
1 parent 968da9a commit 319f440

58 files changed

Lines changed: 388 additions & 388 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/consapp/convbin/convbin.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ static void printhelp(void)
182182
exit(0);
183183
}
184184
/* show message --------------------------------------------------------------*/
185-
extern int showmsg(const char *format, ...)
185+
int showmsg(const char *format, ...)
186186
{
187187
va_list arg;
188188
va_start(arg,format); vfprintf(stderr,format,arg); va_end(arg);

‎app/consapp/rnx2rtkp/rnx2rtkp.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ static const char *help[]={
7878
" --version display release version"
7979
};
8080
/* show message --------------------------------------------------------------*/
81-
extern int showmsg(const char *format, ...)
81+
int showmsg(const char *format, ...)
8282
{
8383
va_list arg;
8484
va_start(arg,format); vfprintf(stderr,format,arg); va_end(arg);
8585
fprintf(stderr,"\r");
8686
return 0;
8787
}
88-
extern void settspan(gtime_t ts, gtime_t te) {}
89-
extern void settime(gtime_t time) {}
88+
void settspan(gtime_t ts, gtime_t te) {}
89+
void settime(gtime_t time) {}
9090

9191
/* print help ----------------------------------------------------------------*/
9292
static void printhelp(void)

‎app/consapp/rtkrcv/vt.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* char *dev I device ("": standard tty)
5858
* return : virtual console (NULL: error)
5959
*-----------------------------------------------------------------------------*/
60-
extern vt_t *vt_open(int sock, const char *dev)
60+
vt_t *vt_open(int sock, const char *dev)
6161
{
6262
const char mode[]={C_IAC,C_WILL,C_SUPPGA,C_IAC,C_WILL,C_ECHO};
6363
struct termios tio={0};
@@ -101,7 +101,7 @@ extern vt_t *vt_open(int sock, const char *dev)
101101
* args : vt_t *vt I virtual console
102102
* return : none
103103
*-----------------------------------------------------------------------------*/
104-
extern void vt_close(vt_t *vt)
104+
void vt_close(vt_t *vt)
105105
{
106106
int i;
107107

@@ -258,7 +258,7 @@ static int seq_esc(vt_t *vt)
258258
* return : status (1:ok,0:error)
259259
* notes : if no input, return ok with *c='\0'
260260
*-----------------------------------------------------------------------------*/
261-
extern int vt_getc(vt_t *vt, char *c)
261+
int vt_getc(vt_t *vt, char *c)
262262
{
263263
struct timeval tv={0,1000}; /* timeout (us) */
264264
fd_set rs;
@@ -305,7 +305,7 @@ extern int vt_getc(vt_t *vt, char *c)
305305
* in n I buffer size
306306
* return : status (1:ok,0:no input)
307307
*-----------------------------------------------------------------------------*/
308-
extern int vt_gets(vt_t *vt, char *buff, int n)
308+
int vt_gets(vt_t *vt, char *buff, int n)
309309
{
310310
char c;
311311

@@ -347,7 +347,7 @@ static int vt_putchar(vt_t *vt, char c)
347347
* char c I character
348348
* return : status (1:ok,0:error)
349349
*-----------------------------------------------------------------------------*/
350-
extern int vt_putc(vt_t *vt, char c)
350+
int vt_putc(vt_t *vt, char c)
351351
{
352352
if (c=='\n'&&!vt_putchar(vt,'\r')) return 0;
353353
return vt_putchar(vt,c);
@@ -358,7 +358,7 @@ extern int vt_putc(vt_t *vt, char c)
358358
* char *buff I strings
359359
* return : status (1:ok,0:error)
360360
*-----------------------------------------------------------------------------*/
361-
extern int vt_puts(vt_t *vt, const char *buff)
361+
int vt_puts(vt_t *vt, const char *buff)
362362
{
363363
const char *p;
364364
for (p=buff;*p;p++) if (!vt_putc(vt,*p)) return 0;
@@ -371,7 +371,7 @@ extern int vt_puts(vt_t *vt, const char *buff)
371371
* ... I variable arguments
372372
* return : status (1:ok,0:error)
373373
*-----------------------------------------------------------------------------*/
374-
extern int vt_printf(vt_t *vt, const char *format, ...)
374+
int vt_printf(vt_t *vt, const char *format, ...)
375375
{
376376
va_list ap;
377377
char buff[MAXBUFF+1];
@@ -385,7 +385,7 @@ extern int vt_printf(vt_t *vt, const char *format, ...)
385385
* args : vt_t *vt I virtual console
386386
* return : status (1:break,0:no break)
387387
*-----------------------------------------------------------------------------*/
388-
extern int vt_chkbrk(vt_t *vt)
388+
int vt_chkbrk(vt_t *vt)
389389
{
390390
char c;
391391
vt->brk=0;
@@ -397,7 +397,7 @@ extern int vt_chkbrk(vt_t *vt)
397397
* char *file I log file path
398398
* return : status (1:ok,0:error)
399399
*-----------------------------------------------------------------------------*/
400-
extern int vt_openlog(vt_t *vt, const char *file)
400+
int vt_openlog(vt_t *vt, const char *file)
401401
{
402402
if (!vt||!vt->state||!(vt->logfp=fopen(file,"w"))) return 0;
403403
return 1;
@@ -407,7 +407,7 @@ extern int vt_openlog(vt_t *vt, const char *file)
407407
* args : vt_t *vt I virtual console
408408
* return : none
409409
*-----------------------------------------------------------------------------*/
410-
extern void vt_closelog(vt_t *vt)
410+
void vt_closelog(vt_t *vt)
411411
{
412412
if (!vt||!vt->state||!vt->logfp) return;
413413
fclose(vt->logfp);

‎app/qtapp/rtkconv_qt/convmain.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static int abortf = 0;
6464

6565
// show message in message area ---------------------------------------------
6666
extern "C" {
67-
extern int showmsg(const char *format, ...)
67+
int showmsg(const char *format, ...)
6868
{
6969
va_list arg;
7070
char buff[1024];
@@ -75,8 +75,8 @@ extern "C" {
7575

7676
return abortf;
7777
}
78-
extern void settime(gtime_t) {}
79-
extern void settspan(gtime_t, gtime_t) {}
78+
void settime(gtime_t) {}
79+
void settspan(gtime_t, gtime_t) {}
8080
}
8181

8282
// constructor --------------------------------------------------------------

‎app/qtapp/rtkget_qt/getmain.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ MainForm *mainForm;
6363

6464
// show message in message area ---------------------------------------------
6565
extern "C" {
66-
extern int showmsg(const char *format, ...)
66+
int showmsg(const char *format, ...)
6767
{
6868
va_list arg;
6969
QString str;

‎app/qtapp/rtknavi_qt/navimain.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ static int strfmt[] = { /* stream formats */
100100

101101
// show message in message area ---------------------------------------------
102102
extern "C" {
103-
extern int showmsg(const char *, ...)
103+
int showmsg(const char *, ...)
104104
{
105105
return 0;
106106
}
107-
extern void settime(gtime_t) {}
108-
extern void settspan(gtime_t, gtime_t) {}
107+
void settime(gtime_t) {}
108+
void settspan(gtime_t, gtime_t) {}
109109
}
110110

111111
// constructor --------------------------------------------------------------

‎app/qtapp/rtkplot_qt/plotmain.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
#define qMaxSHAPEFILE 16 // max number of shape files
9191

9292
extern "C" {
93-
extern void settime(gtime_t) {}
94-
extern void settspan(gtime_t, gtime_t) {}
93+
void settime(gtime_t) {}
94+
void settspan(gtime_t, gtime_t) {}
9595
}
9696

9797

‎app/qtapp/rtkpost_qt/postmain.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ MainForm *mainForm;
7878
extern "C" {
7979

8080
// show message in message area ---------------------------------------------
81-
extern int showmsg(const char *format, ...)
81+
int showmsg(const char *format, ...)
8282
{
8383
va_list arg;
8484
char buff[1024];
@@ -93,13 +93,13 @@ extern int showmsg(const char *format, ...)
9393
return mainForm->abortFlag;
9494
}
9595
// set time span of progress bar --------------------------------------------
96-
extern void settspan(gtime_t ts, gtime_t te)
96+
void settspan(gtime_t ts, gtime_t te)
9797
{
9898
tstart_ = ts;
9999
tend_ = te;
100100
}
101101
// set current time to show progress ----------------------------------------
102-
extern void settime(gtime_t time)
102+
void settime(gtime_t time)
103103
{
104104
double tt;
105105
if (tend_.time != 0 && tstart_.time != 0 && (tt = timediff(tend_, tstart_)) > 0.0) {

‎app/qtapp/srctblbrows_qt/browsmain.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ static char buff[MAXSRCTBL]; // source table buffer
3737
MainForm *mainForm;
3838

3939
extern "C" {
40-
extern int showmsg(const char *, ...) {return 0;}
41-
extern void settime(gtime_t) {}
42-
extern void settspan(gtime_t, gtime_t) {}
40+
int showmsg(const char *, ...) {return 0;}
41+
void settime(gtime_t) {}
42+
void settspan(gtime_t, gtime_t) {}
4343
}
4444

4545
/* get source table -------------------------------------------------------*/

‎app/qtapp/strsvr_qt/svrmain.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
strsvr_t strsvr;
5656

5757
extern "C" {
58-
extern int showmsg(const char *, ...) {return 0;}
59-
extern void settime(gtime_t) {}
60-
extern void settspan(gtime_t, gtime_t) {}
58+
int showmsg(const char *, ...) {return 0;}
59+
void settime(gtime_t) {}
60+
void settspan(gtime_t, gtime_t) {}
6161
}
6262

6363

0 commit comments

Comments
 (0)