Changeset 7882a6f in code for icb.c

Timestamp:

Mar 10, 2014, 12:13:22 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

fe81e9a

Parents:

e80f9fc

Message:

Get rid of the icbd callbacks interface

I believe the idea was initially to have both icb and irc in one
daemon but that's not going to happen.

File:

• icb.c (modified) (12 diffs)

icb.c

@@ -43 +43 @@
  */
 void
-icb_init(struct icbd_callbacks *ic)
-{
-        icb_drop = ic->drop;
-        icb_log = ic->log;
-        icb_send = ic->send;
-
+icb_init(void)
+{
         LIST_INIT(&groups);
 
@@ -98 +94 @@
                 if (strlen(cmd) > 0 && cmd[0] == 'w') {
                         icb_error(is, "Command not implemented");
-                        icb_drop(is, NULL);
+                        icbd_drop(is, NULL);
                         return;
                 }
                 if (strlen(cmd) == 0 || strcmp(cmd, "login") != 0) {
                         icb_error(is, "Malformed login packet");
-                        icb_drop(is, NULL);
+                        icbd_drop(is, NULL);
                         return;
                 }
@@ -152 +148 @@
             icb_vis(is->nick, nick, ICB_MAXNICKLEN, VIS_SP)) {
                 icb_error(is, "Invalid nick");
-                icb_drop(is, NULL);
+                icbd_drop(is, NULL);
                 return;
         }
@@ -166 +162 @@
                 if (!creategroups) {
                         icb_error(is, "Invalid group %s", group);
-                        icb_drop(is, NULL);
+                        icbd_drop(is, NULL);
                         return;
                 } else {
@@ -173 +169 @@
                                 return;
                         }
-                        icb_log(NULL, LOG_DEBUG, "%s created group %s",
+                        icbd_log(NULL, LOG_DEBUG, "%s created group %s",
                             is->nick, group);
                 }
@@ -180 +176 @@
                 if (strcmp(s->nick, is->nick) == 0) {
                         icb_error(is, "Nick is already in use");
-                        icb_drop(is, NULL);
+                        icbd_drop(is, NULL);
                         return;
                 }
@@ -238 +234 @@
                 if (s == is)
                         continue;
-                icb_send(s, buf, buflen + 1);
+                icbd_send(s, buf, buflen + 1);
         }
 }
@@ -321 +317 @@
                 break;
         default:
-                icb_log(is, LOG_ERR, "unknown cmdout type");
+                icbd_log(is, LOG_ERR, "unknown cmdout type %d", type);
                 return;
         }
@@ -367 +363 @@
         buf[0] = buflen;
         va_end(ap);
-        icb_send(is, buf, buflen + 1);
+        icbd_send(is, buf, buflen + 1);
 }
 
@@ -390 +386 @@
         }
         logger(ig->name, "", buf);
-        icb_log(NULL, LOG_DEBUG, "%s", buf);
+        icbd_log(NULL, LOG_DEBUG, "%s", buf);
         va_end(ap);
 }
@@ -409 +405 @@
         buf[0] = ++buflen; /* account for ICB_M_ERROR */
         buf[1] = ICB_M_ERROR;
-        icb_send(is, buf, buflen + 1);
-        icb_log(is, LOG_DEBUG, "%s", buf + 2);
+        icbd_send(is, buf, buflen + 1);
+        icbd_log(is, LOG_DEBUG, "%s", buf + 2);
 }
 
@@ -620 +616 @@
         va_end(ap);
         buf[0] = buflen;
-        icb_send(is, buf, buflen + 1);
+        icbd_send(is, buf, buflen + 1);
 }