Changeset 08135df for protocols/oscar/msgcookie.c

Timestamp:

2007-12-04T01:08:43Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

793cc25

Parents:

fa30fa5 (diff), aaf92a9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged in current devel

Wilmer van der Gaast 2007-12-02 Imported setuid() patch from Simo Leone <simo@archlinux...> with some

Wilmer van der Gaast 2007-12-02 Forgot to return something in jabber_chat_join_failed().
Wilmer van der Gaast 2007-12-02 Merging a change I should've pulled before committing three other changes.
Wilmer van der Gaast 2007-12-02 Added charset checks on incoming msgs (from the IRC side) to prevent possible
Wilmer van der Gaast 2007-12-02 Handling of presence-error packets (only useful for groupchats now), moved
Wilmer van der Gaast 2007-12-02 Defining DEBUG via CFLAGS so that it'll always be there, even when a file
Wilmer van der Gaast 2007-12-02 Removed retarded printf() (ARGH) and moved the event handling handling of
Wilmer van der Gaast 2007-11-29 printf() in daemons considered harmful.
Wilmer van der Gaast 2007-11-28 Fixed the epoll+ForkDaemon combination. The libevent event handling

File:

• protocols/oscar/msgcookie.c (modified) (1 diff)

protocols/oscar/msgcookie.c

@@ -131 +131 @@
 }
 
-#if 0 /* debugging feature */
-int aim_dumpcookie(aim_msgcookie_t *cookie) 
-{
-
-        if (!cookie)
-                return -EINVAL;
-
-        printf("\tCookie at %p: %d/%s with %p, next %p\n", 
-                        cookie, cookie->type, cookie->cookie, 
-                        cookie->data, cookie->next);
-
-        return 0;
-}
-#endif
-
 /**
  * aim_cookie_free - free an aim_msgcookie_t struct