From b76b3b49fab36589d06fb869c09632587ee8843a Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Sat, 21 Apr 2018 01:45:09 +0300 Subject: [PATCH] rename static buffer --- src/auth.c | 16 +++++++++------- src/proxy.h | 1 - 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/auth.c b/src/auth.c index 7e8a12e..ff27ab0 100644 --- a/src/auth.c +++ b/src/auth.c @@ -1402,6 +1402,8 @@ void sqlerr (char *buf){ pthread_mutex_unlock(&log_mutex); } +unsigned char statbuf[8192]; + void logsql(struct clientparam * param, const unsigned char *s) { SQLRETURN ret; int len; @@ -1409,35 +1411,35 @@ void logsql(struct clientparam * param, const unsigned char *s) { if(param->nolog) return; pthread_mutex_lock(&log_mutex); - len = dobuf(param, tmpbuf, s, (unsigned char *)"\'"); + len = dobuf(param, statbuf, s, (unsigned char *)"\'"); if(attempt > 5){ time_t t; t = time(0); if (t - attempt_time < 180){ - sqlerr((char *)tmpbuf); + sqlerr((char *)statbuf); return; } } if(!hstmt){ if(!init_sql(sqlstring)) { - sqlerr((char *)tmpbuf); + sqlerr((char *)statbuf); return; } } if(hstmt){ - ret = SQLExecDirect(hstmt, (SQLCHAR *)tmpbuf, (SQLINTEGER)len); + ret = SQLExecDirect(hstmt, (SQLCHAR *)statbuf, (SQLINTEGER)len); if(ret != SQL_SUCCESS && ret != SQL_SUCCESS_WITH_INFO){ close_sql(); if(!init_sql(sqlstring)){ - sqlerr((char *)tmpbuf); + sqlerr((char *)statbuf); return; } if(hstmt) { - ret = SQLExecDirect(hstmt, (SQLCHAR *)tmpbuf, (SQLINTEGER)len); + ret = SQLExecDirect(hstmt, (SQLCHAR *)statbuf, (SQLINTEGER)len); if(ret != SQL_SUCCESS && ret != SQL_SUCCESS_WITH_INFO){ - sqlerr((char *)tmpbuf); + sqlerr((char *)statbuf); return; } attempt = 0; diff --git a/src/proxy.h b/src/proxy.h index 8dba399..9e5b1fb 100644 --- a/src/proxy.h +++ b/src/proxy.h @@ -311,7 +311,6 @@ struct datatype; struct dictionary; struct node; struct property; -extern unsigned char tmpbuf[8192]; extern pthread_mutex_t config_mutex; extern pthread_mutex_t bandlim_mutex; extern pthread_mutex_t connlim_mutex;