Changeset 5f8ab6a9 for lib

Timestamp:

2010-06-03T10:41:03Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

814aa52

Parents:

3f81999 (diff), f9928cb (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:

merge in bitlbee 1.2.5

Location:

lib

Files:

• misc.c (modified) (3 diffs)
• misc.h (modified) (1 diff)

lib/misc.c

@@ -34 +34 @@
 #include "nogaim.h"
 #include "base64.h"
+#include "md5.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -46 +47 @@
 #endif
 
+#include "md5.h"
 #include "ssl_client.h"
 
@@ -532 +534 @@
 
 /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
-char *word_wrap( char *msg, int line_len )
+char *word_wrap( const char *msg, int line_len )
 {
         GString *ret = g_string_sized_new( strlen( msg ) + 16 );

lib/misc.h

@@ -62 +62 @@
 G_MODULE_EXPORT struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain );
 
-G_MODULE_EXPORT char *word_wrap( char *msg, int line_len );
+G_MODULE_EXPORT char *word_wrap( const char *msg, int line_len );
 
 G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );