bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-10-16 08:35:48 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Remove fields and declarations nothing uses

Browse Source 
conf.haveerror was only initialised and srvparam.srvfds only declared;
the extern declarations of stdlog and demon named globals that do not
exist (both are fields of conf); a local in make_ace() and one in the
webadmin XML page were never used.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Vladimir Dubrovin 2026-10-13 16:12:03 +03:00
parent a2592f4038
commit 8887031324
5 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common.c
View File

@ -247,7 +247,6 @@ struct extparam conf = {
.poolmax = -1, .poolmax = -1,
.pooltimeout = 60, .pooltimeout = 60,
.counterd = -1, .counterd = -1,
.haveerror = 0,
.rotate = 0, .rotate = 0,
.paused = 0, .paused = 0,
.archiverc = 0, .archiverc = 0,

1
src/conf.c
View File

@ -1337,7 +1337,6 @@ struct ace * make_ace (int argc, unsigned char ** argv){
arg = (unsigned char *)strtok((char *)argv[2], ","); arg = (unsigned char *)strtok((char *)argv[2], ",");
if(arg) do { if(arg) do {
int arglen; int arglen;
unsigned char *pattern;
struct iplist tmpip={NULL}; struct iplist tmpip={NULL};
arglen = (int)strlen((char *)arg); arglen = (int)strlen((char *)arg);

2
src/proxy.h
View File

@ -275,7 +275,6 @@ int hascap(const unsigned char *line, const char *cap);
void dolog(struct clientparam * param, const unsigned char *s); void dolog(struct clientparam * param, const unsigned char *s);
int dobuf(struct clientparam * param, unsigned char * buf, const unsigned char *s, const unsigned char * doublec); int dobuf(struct clientparam * param, unsigned char * buf, const unsigned char *s, const unsigned char * doublec);
int dobuf2(struct clientparam * param, unsigned char * buf, const unsigned char *s, const unsigned char * doublec, struct tm* tm, char * format); int dobuf2(struct clientparam * param, unsigned char * buf, const unsigned char *s, const unsigned char * doublec, struct tm* tm, char * format);
extern FILE * stdlog;
void logstdout(struct clientparam * param, const unsigned char *s); void logstdout(struct clientparam * param, const unsigned char *s);
void logsyslog(struct clientparam * param, const unsigned char *s); void logsyslog(struct clientparam * param, const unsigned char *s);
void lognone(struct clientparam * param, const unsigned char *s); void lognone(struct clientparam * param, const unsigned char *s);
@ -316,7 +315,6 @@ int socks5_udp_build_hdr(unsigned char *buf, PROXYSOCKADDRTYPE *addr);
extern struct auth authfuncs[]; extern struct auth authfuncs[];
int reload (void); int reload (void);
extern int demon;
unsigned char * mycrypt(const unsigned char *key, const unsigned char *salt, unsigned char *buf); unsigned char * mycrypt(const unsigned char *key, const unsigned char *salt, unsigned char *buf);
unsigned char * ntpwdhash (unsigned char *szHash, const unsigned char *szPassword, int tohex); unsigned char * ntpwdhash (unsigned char *szHash, const unsigned char *szPassword, int tohex);

3
src/structures.h
View File

@ -671,7 +671,6 @@ struct srvparam {
int o_nsfd; int o_nsfd;
#endif #endif
struct auth *authenticate; struct auth *authenticate;
struct pollfd * srvfds;
struct ace *acl; struct ace *acl;
#ifdef WITH_HTTPSRV #ifdef WITH_HTTPSRV
struct httprule *httprules; struct httprule *httprules;
@ -862,7 +861,7 @@ struct extparam {
struct trafcount * trafcounter; struct trafcount * trafcounter;
struct srvparam *services; struct srvparam *services;
int stacksize, int stacksize,
counterd, haveerror, rotate, paused, archiverc, counterd, rotate, paused, archiverc,
demon, maxchild, backlog, version, noforce, bandlimver, parentretries; demon, maxchild, backlog, version, noforce, bandlimver, parentretries;
unsigned authcachetype, authcachetime; unsigned authcachetype, authcachetime;
int filtermaxsize; int filtermaxsize;

2
src/webadmin.c
View File

@ -503,7 +503,6 @@ int op_admin_services(struct httpreq *r, const unsigned char *params)
{ {
struct clientparam *param = r->param; struct clientparam *param = r->param;
struct printparam pp; struct printparam pp;
char *buf;
const char *sel; const char *sel;
if(param->srv->s_option) return op_admin(r, params); if(param->srv->s_option) return op_admin(r, params);
@ -514,7 +513,6 @@ int op_admin_services(struct httpreq *r, const unsigned char *params)
wrapper the other pages share. */ wrapper the other pages share. */
pp.inbuf = 0; pp.inbuf = 0;
pp.cp = param; pp.cp = param;
buf = NULL;
if(sel[0] == 'X') printstr(&pp, style); if(sel[0] == 'X') printstr(&pp, style);
else { else {