From b9726f3a872f6dc63d83b9d54deb879743d2825c Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sat, 22 Aug 2015 10:33:25 +0000
Subject: [PATCH] Ah, some warning fixes I forgot to commit were hiding in
here. Done.
---
src/sbbs3/scfg/scfg.c | 12 ++++++------
src/sbbs3/scfg/scfgchat.c | 23 ++++++++++++-----------
src/sbbs3/scfg/scfgmsg.c | 18 ++++++++++--------
src/sbbs3/scfg/scfgsub.c | 6 +++---
src/sbbs3/scfg/scfgxfr2.c | 10 ++++++----
src/sbbs3/scfg/scfgxtrn.c | 21 ++++++++++++---------
6 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/src/sbbs3/scfg/scfg.c b/src/sbbs3/scfg/scfg.c
index 790028a51d..24727af67e 100644
--- a/src/sbbs3/scfg/scfg.c
+++ b/src/sbbs3/scfg/scfg.c
@@ -604,7 +604,7 @@ void txt_cfg()
static int txt_dflt,bar;
char str[128],code[128],done=0;
int j,k;
- uint i;
+ uint i,u;
static txtsec_t savtxtsec;
while(1) {
@@ -680,8 +680,8 @@ void txt_cfg()
bail(1);
continue; }
if(cfg.total_txtsecs)
- for(j=cfg.total_txtsecs;j>i;j--)
- cfg.txtsec[j]=cfg.txtsec[j-1];
+ for(u=cfg.total_txtsecs;u>i;u--)
+ cfg.txtsec[u]=cfg.txtsec[u-1];
if((cfg.txtsec[i]=(txtsec_t *)malloc(sizeof(txtsec_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(txtsec_t));
continue; }
@@ -767,7 +767,7 @@ void shell_cfg()
static int shell_dflt,shell_bar;
char str[128],code[128],done=0;
int j,k;
- uint i;
+ uint i,u;
static shell_t savshell;
while(1) {
@@ -846,8 +846,8 @@ void shell_cfg()
bail(1);
continue; }
if(cfg.total_shells)
- for(j=cfg.total_shells;j>i;j--)
- cfg.shell[j]=cfg.shell[j-1];
+ for(u=cfg.total_shells;u>i;u--)
+ cfg.shell[u]=cfg.shell[u-1];
if((cfg.shell[i]=(shell_t *)malloc(sizeof(shell_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(shell_t));
continue; }
diff --git a/src/sbbs3/scfg/scfgchat.c b/src/sbbs3/scfg/scfgchat.c
index c5acc773a2..6ac21a0d9a 100644
--- a/src/sbbs3/scfg/scfgchat.c
+++ b/src/sbbs3/scfg/scfgchat.c
@@ -41,6 +41,7 @@ void page_cfg()
char str[81],done=0;
int j,k;
uint i;
+ uint u;
static page_t savpage;
while(1) {
@@ -87,8 +88,8 @@ while(1) {
continue;
}
if(cfg.total_pages)
- for(j=cfg.total_pages;j>i;j--)
- cfg.page[j]=cfg.page[j-1];
+ for(u=cfg.total_pages;u>i;u--)
+ cfg.page[u]=cfg.page[u-1];
if((cfg.page[i]=(page_t *)malloc(sizeof(page_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(page_t));
continue;
@@ -203,7 +204,7 @@ void chan_cfg()
static int chan_dflt,chan_bar,opt_dflt;
char str[128],code[128],done=0;
int j,k;
- uint i;
+ uint i,u;
static chan_t savchan;
while(1) {
@@ -269,8 +270,8 @@ while(1) {
continue;
}
if(cfg.total_chans)
- for(j=cfg.total_chans;j>i;j--)
- cfg.chan[j]=cfg.chan[j-1];
+ for(u=cfg.total_chans;u>i;u--)
+ cfg.chan[u]=cfg.chan[u-1];
if((cfg.chan[i]=(chan_t *)malloc(sizeof(chan_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(chan_t));
continue;
@@ -593,7 +594,7 @@ void guru_cfg()
static int guru_dflt,guru_bar,opt_dflt;
char str[128],code[128],done=0;
int j,k;
- uint i;
+ uint i,u;
static guru_t savguru;
while(1) {
@@ -657,8 +658,8 @@ while(1) {
continue;
}
if(cfg.total_gurus)
- for(j=cfg.total_gurus;j>i;j--)
- cfg.guru[j]=cfg.guru[j-1];
+ for(u=cfg.total_gurus;u>i;u--)
+ cfg.guru[u]=cfg.guru[u-1];
if((cfg.guru[i]=(guru_t *)malloc(sizeof(guru_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(guru_t));
continue;
@@ -751,7 +752,7 @@ void actsets_cfg()
static int actset_dflt,actset_bar,opt_dflt;
char str[81];
int j,k,done;
- uint i;
+ uint i,u;
static actset_t savactset;
while(1) {
@@ -799,8 +800,8 @@ while(1) {
continue;
}
if(cfg.total_actsets)
- for(j=cfg.total_actsets;j>i;j--)
- cfg.actset[j]=cfg.actset[j-1];
+ for(u=cfg.total_actsets;u>i;u--)
+ cfg.actset[u]=cfg.actset[u-1];
if((cfg.actset[i]=(actset_t *)malloc(sizeof(actset_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(actset_t));
continue;
diff --git a/src/sbbs3/scfg/scfgmsg.c b/src/sbbs3/scfg/scfgmsg.c
index d41ffa0d57..d0d3fbac72 100644
--- a/src/sbbs3/scfg/scfgmsg.c
+++ b/src/sbbs3/scfg/scfgmsg.c
@@ -68,7 +68,8 @@ void clearptrs(int subnum)
{
char str[256];
ushort idx,scancfg;
- int file,i,gi;
+ int file, i;
+ size_t gi;
long l=0L;
glob_t g;
@@ -85,7 +86,7 @@ void clearptrs(int subnum)
}
while(filelength(file)<(long)(cfg.sub[subnum]->ptridx)*10) {
lseek(file,0L,SEEK_END);
- idx=tell(file)/10;
+ idx=(ushort)(tell(file)/10);
for(i=0;i<cfg.total_subs;i++)
if(cfg.sub[i]->ptridx==idx)
break;
@@ -127,6 +128,7 @@ void msgs_cfg()
char tmp_code[32];
int j,k,q,s;
int i,file,ptridx,n;
+ unsigned u;
unsigned total_subs;
long ported;
sub_t tmpsub;
@@ -686,10 +688,10 @@ while(1) {
|| tmpsub.qwkname[0]==0)
continue;
- for(j=0;j<total_subs;j++) {
- if(cfg.sub[j]->grp!=i)
+ for(u=0;u<total_subs;u++) {
+ if(cfg.sub[u]->grp!=i)
continue;
- if(!stricmp(cfg.sub[j]->code_suffix,tmpsub.code_suffix))
+ if(!stricmp(cfg.sub[u]->code_suffix,tmpsub.code_suffix))
break;
}
if(j==total_subs) {
@@ -727,10 +729,10 @@ while(1) {
}
if(j==cfg.total_subs) { /* adding new sub-board */
for(;ptridx<USHRT_MAX;ptridx++) {
- for(n=0;n<total_subs;n++)
- if(cfg.sub[n]->ptridx==ptridx)
+ for(u=0;u<total_subs;u++)
+ if(cfg.sub[u]->ptridx==ptridx)
break;
- if(n==total_subs)
+ if(u==total_subs)
break;
}
cfg.sub[j]->ptridx=ptridx; /* use new ptridx */
diff --git a/src/sbbs3/scfg/scfgsub.c b/src/sbbs3/scfg/scfgsub.c
index fddb910cad..1df77b12df 100644
--- a/src/sbbs3/scfg/scfgsub.c
+++ b/src/sbbs3/scfg/scfgsub.c
@@ -42,7 +42,7 @@ void sub_cfg(uint grpnum)
char path[MAX_PATH+1];
char data_dir[MAX_PATH+1];
int j,m,n,ptridx,q,s;
- uint i,subnum[MAX_OPTS+1];
+ uint i,u,subnum[MAX_OPTS+1];
static sub_t savsub;
while(1) {
@@ -151,8 +151,8 @@ while(1) {
break; }
if(j) {
- for(n=cfg.total_subs;n>subnum[i];n--)
- cfg.sub[n]=cfg.sub[n-1];
+ for(u=cfg.total_subs;u>subnum[i];u--)
+ cfg.sub[u]=cfg.sub[u-1];
for(q=0;q<cfg.total_qhubs;q++)
for(s=0;s<cfg.qhub[q]->subs;s++)
if(cfg.qhub[q]->sub[s]>=subnum[i])
diff --git a/src/sbbs3/scfg/scfgxfr2.c b/src/sbbs3/scfg/scfgxfr2.c
index e6124ebc38..c3a86c19e1 100644
--- a/src/sbbs3/scfg/scfgxfr2.c
+++ b/src/sbbs3/scfg/scfgxfr2.c
@@ -101,6 +101,7 @@ void xfer_cfg()
char tmp_code[32];
int file,j,k,q;
uint i;
+ uint u;
long ported,added;
static lib_t savlib;
dir_t tmpdir;
@@ -172,8 +173,8 @@ while(1) {
continue; }
if(cfg.total_libs) {
- for(j=cfg.total_libs;j>i;j--)
- cfg.lib[j]=cfg.lib[j-1];
+ for(u=cfg.total_libs;u>i;j--)
+ cfg.lib[u]=cfg.lib[u-1];
for(j=0;j<cfg.total_dirs;j++)
if(cfg.dir[j]->lib>=i)
cfg.dir[j]->lib++; }
@@ -669,6 +670,7 @@ void dir_cfg(uint libnum)
char str[128],str2[128],code[128],path[MAX_PATH+1],done=0;
char data_dir[MAX_PATH+1];
int j,n;
+ uint u;
uint i,dirnum[MAX_OPTS+1];
static dir_t savdir;
@@ -765,8 +767,8 @@ while(1) {
continue; }
if(j)
- for(n=cfg.total_dirs;n>dirnum[i];n--)
- cfg.dir[n]=cfg.dir[n-1];
+ for(u=cfg.total_dirs;u>dirnum[i];u--)
+ cfg.dir[u]=cfg.dir[u-1];
if((cfg.dir[dirnum[i]]=(dir_t *)malloc(sizeof(dir_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(dir_t));
continue; }
diff --git a/src/sbbs3/scfg/scfgxtrn.c b/src/sbbs3/scfg/scfgxtrn.c
index 6c94eeb122..f87b111e95 100644
--- a/src/sbbs3/scfg/scfgxtrn.c
+++ b/src/sbbs3/scfg/scfgxtrn.c
@@ -1458,6 +1458,7 @@ void xedit_cfg()
char str[81],code[81],done=0;
int j,k;
uint i;
+ uint u;
static xedit_t savxedit;
while(1) {
@@ -1520,8 +1521,8 @@ while(1) {
continue;
}
if(cfg.total_xedits)
- for(j=cfg.total_xedits;j>i;j--)
- cfg.xedit[j]=cfg.xedit[j-1];
+ for(u=cfg.total_xedits;u>i;u--)
+ cfg.xedit[u]=cfg.xedit[u-1];
if((cfg.xedit[i]=(xedit_t *)malloc(sizeof(xedit_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(xedit_t));
continue;
@@ -1925,7 +1926,7 @@ int natvpgm_cfg()
static int dflt,bar;
char str[81];
int j;
- uint i;
+ uint i,u;
while(1) {
for(i=0;i<MAX_OPTS && i<cfg.total_natvpgms;i++)
@@ -1969,8 +1970,8 @@ while(1) {
continue;
}
if(cfg.total_natvpgms)
- for(j=cfg.total_natvpgms;j>i;j--)
- cfg.natvpgm[j]=cfg.natvpgm[j-1];
+ for(u=cfg.total_natvpgms;u>i;u--)
+ cfg.natvpgm[u]=cfg.natvpgm[u-1];
if((cfg.natvpgm[i]=(natvpgm_t *)malloc(sizeof(natvpgm_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(natvpgm_t));
continue;
@@ -2010,6 +2011,7 @@ void xtrnsec_cfg()
char str[128],code[128],done=0;
int j,k;
uint i;
+ uint u;
static xtrnsec_t savxtrnsec;
while(1) {
@@ -2074,8 +2076,8 @@ while(1) {
continue;
}
if(cfg.total_xtrnsecs) {
- for(j=cfg.total_xtrnsecs;j>i;j--)
- cfg.xtrnsec[j]=cfg.xtrnsec[j-1];
+ for(u=cfg.total_xtrnsecs;u>i;u--)
+ cfg.xtrnsec[u]=cfg.xtrnsec[u-1];
for(j=0;j<cfg.total_xtrns;j++)
if(cfg.xtrn[j]->sec>=i)
cfg.xtrn[j]->sec++;
@@ -2193,6 +2195,7 @@ void hotkey_cfg(void)
char str[81],done=0;
int j,k;
uint i;
+ uint u;
static hotkey_t savhotkey;
while(1) {
@@ -2243,8 +2246,8 @@ while(1) {
continue;
}
if(cfg.total_hotkeys)
- for(j=cfg.total_hotkeys;j>i;j--)
- cfg.hotkey[j]=cfg.hotkey[j-1];
+ for(u=cfg.total_hotkeys;u>i;u--)
+ cfg.hotkey[u]=cfg.hotkey[u-1];
if((cfg.hotkey[i]=(hotkey_t *)malloc(sizeof(hotkey_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(hotkey_t));
continue;
--
GitLab