Merge branch 'master' into joonix-dev

This commit is contained in:
joonicks 2018-04-14 02:55:09 +02:00 committed by GitHub
commit 4aa3884573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 8 deletions

View File

@ -886,11 +886,10 @@ int num_matches(const char *mask, const char *text)
int is_safepath(const char *path, int filemustexist)
{
struct stat st;
ino_t ino;
char tmp[PATH_MAX];
const char *src;
char *dst;
int r,mo,dir_r,orr,oerrno;
int mo,dir_r,orr,oerrno;
#ifdef TEST
memset(&st,0,sizeof(st));

View File

@ -150,7 +150,6 @@ void on_join(Chan *chan, char *from)
{
Ban *ban;
ChanUser *cu;
char *channel;
int vpri;
/*
@ -171,7 +170,6 @@ void on_join(Chan *chan, char *from)
if (!chan->bot_is_op)
return;
channel = chan->name;
cu = chan->users;
/*

View File

@ -41,7 +41,6 @@ int orig_kerning;
int read_bigcharset_callback(char *rest)
{
Strp *sp,**pp;
char *opt;
int *n,sz;
@ -119,7 +118,6 @@ int read_bigcharset_callback(char *rest)
int read_bigcharset(char *fname)
{
BigC *bigc;
Strp *sp;
int fd;
if ((fd = open(fname,O_RDONLY)) < 0)
@ -177,7 +175,7 @@ void do_bigsay(COMMAND_ARGS)
Strp *sp;
char output[MSGLEN];
char *pt,*tail,*temp,*temp2;
int i,x,sz;
int i,x;
#ifdef DEBUG
debug("(do_bigsay) rest = \"%s\"\n",rest);
@ -194,7 +192,6 @@ void do_bigsay(COMMAND_ARGS)
#define OEND (output + MSGLEN - 1)
for(i=0;i<charheight;i++)
{
sz = 0;
*output = 0;
tail = output;
for(pt=rest;*pt;pt++)