hirc

commit f310b0e9f6891999f596e92a96ee1770773ed943
parent b17969ebd1ad9271caaddf6db9c103bb454446c4
Author: hhvn <dev@hhvn.uk>
Date:   Wed, 17 Nov 2021 16:43:24 +0000

handle.c hirc.h: use RPL_ and ERR_ in handle function names

Diffstat:
M
handle.c
 | 
50
+++++++++++++++++++++++++-------------------------
M
hirc.h
 | 
19
+++++++++----------

2 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/handle.c b/handle.c
@@ -7,23 +7,23 @@
 #include "hirc.h"
 
 struct Handler handlers[] = {
-	{ "PING", 	handle_PING		},
-	{ "PONG",	handle_PONG		},
-	{ "JOIN",	handle_JOIN		},
-	{ "PART",	handle_PART		},
-	{ "QUIT",	handle_QUIT		},
-	{ "NICK",	handle_NICK		},
-	{ "PRIVMSG",	handle_PRIVMSG  	},
-	{ "NOTICE",	handle_PRIVMSG	  	},
-	{ "001",	handle_WELCOME		},
-	{ "005",	handle_ISUPPORT		},
-	{ "332",	handle_RPLTOPIC		},
-	{ "333",	handle_TOPICWHOTIME	},
-	{ "353",	handle_NAMREPLY		},
-	{ "366",	handle_ENDOFNAMES	},
-	{ "376",	handle_ENDOFMOTD	},
-	{ "433",	handle_NICKNAMEINUSE	},
-	{ NULL,		NULL 			},
+	{ "PING", 	handle_PING			},
+	{ "PONG",	handle_PONG			},
+	{ "JOIN",	handle_JOIN			},
+	{ "PART",	handle_PART			},
+	{ "QUIT",	handle_QUIT			},
+	{ "NICK",	handle_NICK			},
+	{ "PRIVMSG",	handle_PRIVMSG  		},
+	{ "NOTICE",	handle_PRIVMSG	  		},
+	{ "001",	handle_RPL_WELCOME		},
+	{ "005",	handle_RPL_ISUPPORT		},
+	{ "332",	handle_RPL_TOPIC		},
+	{ "333",	handle_RPL_TOPICWHOTIME		},
+	{ "353",	handle_RPL_NAMREPLY		},
+	{ "366",	handle_RPL_ENDOFNAMES		},
+	{ "376",	handle_RPL_ENDOFMOTD		},
+	{ "433",	handle_ERR_NICKNAMEINUSE	},
+	{ NULL,		NULL 				},
 };
 
 void
@@ -195,7 +195,7 @@ handle_PRIVMSG(char *msg, char **params, struct Server *server, time_t timestamp
 }
 
 void
-handle_ISUPPORT(char *msg, char **params, struct Server *server, time_t timestamp) {
+handle_RPL_ISUPPORT(char *msg, char **params, struct Server *server, time_t timestamp) {
 	char *key, *value;
 
 	hist_add(server->history, NULL, msg, params, Activity_status, timestamp, HIST_DFL);
@@ -223,7 +223,7 @@ handle_ISUPPORT(char *msg, char **params, struct Server *server, time_t timestam
 }
 
 void
-handle_NAMREPLY(char *msg, char **params, struct Server *server, time_t timestamp) {
+handle_RPL_NAMREPLY(char *msg, char **params, struct Server *server, time_t timestamp) {
 	struct Channel *chan;
 	struct Nick *oldnick;
 	char **bparams = params;
@@ -276,7 +276,7 @@ handle_NAMREPLY(char *msg, char **params, struct Server *server, time_t timestam
 }
 
 void
-handle_ENDOFNAMES(char *msg, char **params, struct Server *server, time_t timestamp) {
+handle_RPL_ENDOFNAMES(char *msg, char **params, struct Server *server, time_t timestamp) {
 	char *target;
 
 	hist_add(server->history, NULL, msg, params, Activity_status, timestamp, HIST_LOG);
@@ -292,7 +292,7 @@ handle_ENDOFNAMES(char *msg, char **params, struct Server *server, time_t timest
 }
 
 void
-handle_NICKNAMEINUSE(char *msg, char **params, struct Server *server, time_t timestamp) {
+handle_ERR_NICKNAMEINUSE(char *msg, char **params, struct Server *server, time_t timestamp) {
 	char nick[64]; /* should be limited to 9 chars, but newer servers *shrug*/
 
 	hist_add(server->history, NULL, msg, params, Activity_status, timestamp, HIST_DFL);
@@ -339,7 +339,7 @@ handle_NICK(char *msg, char **params, struct Server *server, time_t timestamp) {
 }
 
 void
-handle_RPLTOPIC(char *msg, char **params, struct Server *server, time_t timestamp) {
+handle_RPL_TOPIC(char *msg, char **params, struct Server *server, time_t timestamp) {
 	struct Channel *chan;
 	char *target, *topic;
 
@@ -365,7 +365,7 @@ handle_RPLTOPIC(char *msg, char **params, struct Server *server, time_t timestam
 }
 
 void
-handle_TOPICWHOTIME(char *msg, char **params, struct Server *server, time_t timestamp) {
+handle_RPL_TOPICWHOTIME(char *msg, char **params, struct Server *server, time_t timestamp) {
 	struct Channel *chan;
 	char *target;
 
@@ -386,13 +386,13 @@ handle_TOPICWHOTIME(char *msg, char **params, struct Server *server, time_t time
 }
 
 void
-handle_WELCOME(char *msg, char **params, struct Server *server, time_t timestamp) {
+handle_RPL_WELCOME(char *msg, char **params, struct Server *server, time_t timestamp) {
 	server->status = ConnStatus_connected;
 	hist_add(server->history, NULL, msg, params, Activity_status, timestamp, HIST_DFL);
 }
 
 void
-handle_ENDOFMOTD(char *msg, char **params, struct Server *server, time_t timestamp) {
+handle_RPL_ENDOFMOTD(char *msg, char **params, struct Server *server, time_t timestamp) {
 	/* If server doesn't support RPL_WELCOME, use RPL_ENDOFMOTD to set status */
 	server->status = ConnStatus_connected;
 	hist_add(server->history, NULL, msg, params, Activity_status, timestamp, HIST_DFL);
diff --git a/hirc.h b/hirc.h
@@ -92,17 +92,16 @@ void		handle_PONG(char *msg, char **params, struct Server *server, time_t timest
 void		handle_JOIN(char *msg, char **params, struct Server *server, time_t timestamp);
 void		handle_PART(char *msg, char **params, struct Server *server, time_t timestamp);
 void		handle_QUIT(char *msg, char **params, struct Server *server, time_t timestamp);
-void		handle_PRIVMSG(char *msg, char **params, struct Server *server, time_t timestamp);
-void		handle_WELCOME(char *msg, char **params, struct Server *server, time_t timestamp);
-void		handle_ISUPPORT(char *msg, char **params, struct Server *server, time_t timestamp);
-void		handle_RPLTOPIC(char *msg, char **params, struct Server *server, time_t timestamp);
-void		handle_TOPICWHOTIME(char *msg, char **params, struct Server *server, time_t timestamp);
-void		handle_NAMREPLY(char *msg, char **params, struct Server *server, time_t timestamp);
-void		handle_NAMREPLY(char *msg, char **params, struct Server *server, time_t timestamp);
-void		handle_ENDOFNAMES(char *msg, char **params, struct Server *server, time_t timestamp);
-void		handle_ENDOFMOTD(char *msg, char **params, struct Server *server, time_t timestamp);
-void		handle_NICKNAMEINUSE(char *msg, char **params, struct Server *server, time_t timestamp);
 void		handle_NICK(char *msg, char **params, struct Server *server, time_t timestamp);
+void		handle_PRIVMSG(char *msg, char **params, struct Server *server, time_t timestamp);
+void		handle_RPL_WELCOME(char *msg, char **params, struct Server *server, time_t timestamp);
+void		handle_RPL_ISUPPORT(char *msg, char **params, struct Server *server, time_t timestamp);
+void		handle_RPL_TOPIC(char *msg, char **params, struct Server *server, time_t timestamp);
+void		handle_RPL_TOPICWHOTIME(char *msg, char **params, struct Server *server, time_t timestamp);
+void		handle_RPL_NAMREPLY(char *msg, char **params, struct Server *server, time_t timestamp);
+void		handle_RPL_ENDOFNAMES(char *msg, char **params, struct Server *server, time_t timestamp);
+void		handle_RPL_ENDOFMOTD(char *msg, char **params, struct Server *server, time_t timestamp);
+void		handle_ERR_NICKNAMEINUSE(char *msg, char **params, struct Server *server, time_t timestamp);
 
 /* ui.c */
 void		ui_init(void);