X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/70c365cb350315dd2146847f05a276938fb042aa..43946961df9e7703c8877e4bbd9181507422429d:/modules/m_resv.c

diff --git a/modules/m_resv.c b/modules/m_resv.c
index 7ad97e69..92e57309 100644
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -36,8 +36,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "hash.h"
-#include "s_log.h"
-#include "sprintf_irc.h"
+#include "logger.h"
 
 static int mo_resv(struct Client *, struct Client *, int, const char **);
 static int ms_resv(struct Client *, struct Client *, int, const char **);
@@ -224,9 +223,9 @@ parse_resv(struct Client *source_p, const char *name,
 		aconf = make_conf();
 		aconf->status = CONF_RESV_CHANNEL;
 		aconf->port = 0;
-		aconf->info.name = rb_strdup(name);
+		aconf->name = rb_strdup(name);
 		aconf->passwd = rb_strdup(reason);
-		add_to_resv_hash(aconf->info.name, aconf);
+		add_to_resv_hash(aconf->name, aconf);
 
 		if(temp_time > 0)
 		{
@@ -243,7 +242,7 @@ parse_resv(struct Client *source_p, const char *name,
 					temp_time / 60, name);
 		}
 		else
-			write_confitem(RESV_TYPE, source_p, NULL, aconf->info.name, 
+			write_confitem(RESV_TYPE, source_p, NULL, aconf->name, 
 					aconf->passwd, NULL, NULL, 0);
 	}
 	else if(clean_resv_nick(name))
@@ -282,7 +281,7 @@ parse_resv(struct Client *source_p, const char *name,
 		aconf = make_conf();
 		aconf->status = CONF_RESV_NICK;
 		aconf->port = 0;
-		aconf->info.name = rb_strdup(name);
+		aconf->name = rb_strdup(name);
 		aconf->passwd = rb_strdup(reason);
 		rb_dlinkAddAlloc(aconf, &resv_conf_list);
 
@@ -301,7 +300,7 @@ parse_resv(struct Client *source_p, const char *name,
 					temp_time / 60, name);
 		}
 		else
-			write_confitem(RESV_TYPE, source_p, NULL, aconf->info.name, 
+			write_confitem(RESV_TYPE, source_p, NULL, aconf->name, 
 					aconf->passwd, NULL, NULL, 0);
 	}
 	else
@@ -490,7 +489,7 @@ remove_resv(struct Client *source_p, const char *name)
 		{
 			aconf = ptr->data;
 
-			if(irccmp(aconf->info.name, name))
+			if(irccmp(aconf->name, name))
 				aconf = NULL;
 			else
 				break;
@@ -577,7 +576,7 @@ remove_resv_from_file(struct Client *source_p, const char *name)
 			break;
 		}
 
-		strlcpy(buff, buf, sizeof(buff));
+		rb_strlcpy(buff, buf, sizeof(buff));
 
 		if((p = strchr(buff, '\n')) != NULL)
 			*p = '\0';