Changeset 9767d03 for irc_send.c

Timestamp:

2018-07-31T04:41:55Z (6 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

fa1bc1d

Parents:

f7cc734

git-author:

dequis <dx@…> (31-07-18 04:41:21)

git-committer:

dequis <dx@…> (31-07-18 04:41:55)

Message:

Modify server-time implementation to not change API

The new functions with the different paramters are flagged as internal,
so it doesn't even add new symbols.

abi-compliance checker says it's 100% compatible, yay.

File:

• irc_send.c (modified) (6 diffs)

irc_send.c

@@ -136 +136 @@
 
         dst = irc_user_msgdest(iu);
-        irc_send_msg(iu, cmd, dst, text, NULL, 0);
+        irc_send_msg(iu, cmd, dst, text, NULL);
 }
 
@@ -363 +363 @@
 }
 
-void irc_send_msg(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix, time_t ts)
+void irc_send_msg(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix)
+{
+        irc_send_msg_ts(iu, type, dst, msg, prefix, 0);
+}
+
+void irc_send_msg_ts(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix, time_t ts)
 {
         char last = 0;
@@ -384 +389 @@
                 }
                 if (*s == 0 || *s == '\n') {
-                        if (ts)
+                        if (ts) {
                                 tags = irc_format_servertime(iu->irc, ts);
+                        }
                         if (g_strncasecmp(line, "/me ", 4) == 0 && (!prefix || !*prefix) &&
                             g_strcasecmp(type, "PRIVMSG") == 0) {
@@ -391 +397 @@
                                 strncat(raw_msg, line + 4, s - line - 4);
                                 strcat(raw_msg, "\001");
-                                irc_send_msg_raw(iu, type, dst, tags, raw_msg);
+                                irc_send_msg_raw_tags(iu, type, dst, tags, raw_msg);
                         } else {
                                 *raw_msg = '\0';
@@ -398 +404 @@
                                 }
                                 strncat(raw_msg, line, s - line);
-                                irc_send_msg_raw(iu, type, dst, tags, raw_msg);
+                                irc_send_msg_raw_tags(iu, type, dst, tags, raw_msg);
                         }
-                        if (ts)
+                        if (ts) {
                                 g_free(tags);
+                        }
                         line = s + 1;
                 }
@@ -408 +415 @@
 }
 
-void irc_send_msg_raw(irc_user_t *iu, const char *type, const char *dst, const char* tags, const char *msg)
+void irc_send_msg_raw(irc_user_t *iu, const char *type, const char *dst, const char *msg)
+{
+        irc_send_msg_raw_tags(iu, type, dst, NULL, msg);
+}
+
+void irc_send_msg_raw_tags(irc_user_t *iu, const char *type, const char *dst, const char* tags, const char *msg)
 {
         irc_write(iu->irc, "%s%s:%s!%s@%s %s %s :%s",