Fix paul's divergent branch so newserv builds\!

diff --git a/jupe/Makefile.in b/jupe/Makefile.in
index e2dd8b2ed9d4c1d2d3a116f12d337f531f6089f5..e030fcd7fbf7e2fba5c31f37f5b2f9ed3fd4bdb7 100644 (file)
--- a/jupe/Makefile.in
+++ b/jupe/Makefile.in
@@ -1,8 +1,7 @@
 @include@ @includel@../build.mk@includel@
-CFLAGS=-g
 
 .PHONY: all
-all: jupe.so jupe_commands.so
+all: jupe.o jupe_commands.so
 
 jupe.so: jupe.o
 

diff --git a/jupe/jupe.c b/jupe/jupe.c
index 0eb8c52ba79c69ae34d605fad368eff5c9c01f86..3dbcf2ae9f673f575076f38255a588eae7d5a457 100644 (file)
--- a/jupe/jupe.c
+++ b/jupe/jupe.c
@@ -41,7 +41,7 @@ void _fini() {
 
 int handlejupe(void *source, int cargc, char **cargv) {
        char *target, *server, *expire, *modtime, *reason;
-       jupe_t *jupe, *last_jupe;
+       jupe_t *jupe;
        unsigned int flags;
 
        if (cargc < 5)
@@ -54,7 +54,7 @@ int handlejupe(void *source, int cargc, char **cargv) {
        reason = cargv[4];
 
        if (atoi(expire) > JUPE_MAX_EXPIRE || atoi(expire) <= 0)
-               return; /* jupe's expiry date is not valid */
+               return CMD_ERROR; /* jupe's expiry date is not valid */
        
        if (server[0] != '+' && server[0] != '-')
                return CMD_OK; /* not a valid jupe either */
@@ -164,7 +164,6 @@ jupe_t *jupe_find(char *server) {
 }
 
 void jupe_free(jupe_t *jupe) {
-       jupe_t *next = jupe->ju_next;
        jupe_t *trav = jupes;
 
        if (jupe == jupes)

diff --git a/jupe/jupe_commands.c b/jupe/jupe_commands.c
index 0869dce4446210d406af569ce1f358ca61d6fcc3..f0df100f1027ac19cb83e61b8340af2e7551f39a 100644 (file)
--- a/jupe/jupe_commands.c
+++ b/jupe/jupe_commands.c
@@ -1,6 +1,8 @@
 #include "../control/control.h"
 #include "../nick/nick.h"
 #include "../channel/channel.h"
+#include "../lib/irc_string.h"
+#include "../irc/irc.h"
 #include "jupe.h"
 
 int ju_addjupe(void *source, int cargc, char **cargv) {
@@ -22,7 +24,7 @@ int ju_addjupe(void *source, int cargc, char **cargv) {
        duration = durationtolong(cargv[1]);
        
        if (duration > JUPE_MAX_EXPIRE) {
-               controlreply(np, "A jupe's maximum duration is %s. Could not create jupe.", longtoduration(JUPE_MAX_EXPIRE));
+               controlreply(np, "A jupe's maximum duration is %s. Could not create jupe.", longtoduration(JUPE_MAX_EXPIRE, 0));
 
                return CMD_OK;
        }
@@ -110,7 +112,7 @@ int ju_jupelist(void *source, int cargc, char **cargv) {
        controlreply(np, "Server Reason Expires Status");
 
        while (jupe) {
-               controlreply(np, "%s %s %s %s", JupeServer(jupe), JupeReason(jupe), longtoduration(jupe->ju_expire - getnettime()), (jupe->ju_flags & JUPE_ACTIVE) ? "activated" : "deactivated");
+               controlreply(np, "%s %s %s %s", JupeServer(jupe), JupeReason(jupe), longtoduration(jupe->ju_expire - getnettime(), 0), (jupe->ju_flags & JUPE_ACTIVE) ? "activated" : "deactivated");
                
                jupe = jupe->ju_next;
        }

diff --git a/request/sqrequest.c b/request/sqrequest.c
index 00ae73b487a242879469c132549d44edfb4a2db2..3e8ccde6067ca40da4d73caa340e12af45a258c6 100644 (file)
--- a/request/sqrequest.c
+++ b/request/sqrequest.c
@@ -109,7 +109,7 @@ static void qr_result(requestrec *req, int outcome, char failcode, char *message
   requestrec **rh;
   char msgbuf[512];
   va_list va;
-  nick *lnp, *qnp, *np, *tnp, *snp;
+  nick *np, *tnp, *snp;
   char now[50];
   time_t now_ts;
   unsigned int unique, total;