hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to Coverity defects: 72662 82143 82144 82145 82348 82349

Browse Source
This commit is contained in:
Markus Makela
2014-11-20 06:44:43 +02:00
parent 43ed77b52b
commit a65b9fa8b3
8 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/dcb.c
View File

@ -1181,7 +1181,7 @@ int above_water;
void
dcb_close(DCB *dcb)
{
int rc;
int rc = 0;
CHK_DCB(dcb);

27
server/core/gateway.c
View File

@ -1528,11 +1528,11 @@ int main(int argc, char **argv)
{
char buf[1024];
char *argv[8];
bool succp;
bool succp;
sprintf(buf, "%s/log", home_dir);
if(mkdir(buf, 0777) != 0){
if(errno != EEXIST){
fprintf(stderr,
"Error: Cannot create log directory: %s\n",buf);
@ -1585,9 +1585,26 @@ int main(int argc, char **argv)
* machine.
*/
sprintf(datadir, "%s/data", home_dir);
mkdir(datadir, 0777);
if(mkdir(datadir, 0777) != 0){
if(errno != EEXIST){
fprintf(stderr,
"Error: Cannot create data directory: %s\n",datadir);
goto return_main;
}
}
sprintf(datadir, "%s/data/data%d", home_dir, getpid());
mkdir(datadir, 0777);
if(mkdir(datadir, 0777) != 0){
if(errno != EEXIST){
fprintf(stderr,
"Error: Cannot create data directory: %s\n",datadir);
goto return_main;
}
}
if (!daemon_mode)
{

8
server/core/poll.c
View File

@ -1444,7 +1444,7 @@ void
dShowEventQ(DCB *pdcb)
{
DCB *dcb;
char *tmp1, *tmp2;
spinlock_acquire(&pollqlock);
if (eventq == NULL)
{
@ -1460,8 +1460,10 @@ DCB *dcb;
do {
dcb_printf(pdcb, "%-16p | %-10s | %-18s | %-18s\n", dcb,
dcb->evq.processing ? "Processing" : "Pending",
event_to_string(dcb->evq.processing_events),
event_to_string(dcb->evq.pending_events));
(tmp1 = event_to_string(dcb->evq.processing_events)),
(tmp2 = event_to_string(dcb->evq.pending_events)));
free(tmp1);
free(tmp2);
dcb = dcb->evq.next;
} while (dcb != eventq);
spinlock_release(&pollqlock);