io/pn_buffer.c io/pn_buffer.h @@ -91,7 +91,7 @@ objects := msn.o \ cmd/msg.o \ cmd/table.o \ cmd/transaction.o \ - io/pecan_buffer.o \ + io/pn_buffer.o \ io/pecan_parser.o \ ab/pecan_group.o \ ab/pecan_contact.o \ Makefile @@ -67,7 +67,7 @@ in Windows. * Don't rely on GLib's mainloop. (for Adium X) * Use gio * Use libsoup - * Properly use and test pecan_buffer. + * Properly use and test pn_buffer. * Port offline message support from libgmsn. * Allow cancel in authorization dialog. * Allow alias from the add buddy dialog. TODO @@ -428,7 +428,7 @@ pecan_contact_set_guid (PecanContact *contact, void pecan_contact_set_buddy_icon (PecanContact *contact, - PecanBuffer *image) + PnBuffer *image) { #if defined(PECAN_CVR) #ifdef HAVE_LIBPURPLE ab/pecan_contact.c @@ -27,7 +27,7 @@ typedef struct PecanContact PecanContact; #include "cvr/pn_msnobj.h" #endif /* defined(PECAN_CVR) */ -#include "io/pecan_buffer.h" +#include "io/pn_buffer.h" #include "pecan_contactlist.h" @@ -133,7 +133,7 @@ void pecan_contact_set_guid (PecanContact *contact, * @param img The buddy icon image */ void pecan_contact_set_buddy_icon (PecanContact *contact, - PecanBuffer *buffer); + PnBuffer *buffer); /** * Adds the group ID for a contact. ab/pecan_contact.h @@ -24,7 +24,7 @@ MSNSOURCES = msn.c \ cmd/msg.c \ cmd/table.c \ cmd/transaction.c \ - io/pecan_buffer.c \ + io/pn_buffer.c \ io/pecan_parser.c \ ab/pecan_group.c \ ab/pecan_contact.c \ adium/Makefile.am @@ -20,7 +20,7 @@ #include "cvr/pn_msnobj.h" #include "pn_log.h" -#include "io/pecan_buffer.h" +#include "io/pn_buffer.h" #include <string.h> #include <stdlib.h> @@ -47,7 +47,7 @@ struct PnMsnObj gchar *sha1d; gchar *sha1c; - PecanBuffer *image; + PnBuffer *image; }; #define GET_STRING_TAG(field, id) \ @@ -125,7 +125,7 @@ pn_msnobj_new_from_string(const gchar *str) } PnMsnObj * -pn_msnobj_new_from_image(PecanBuffer *image, +pn_msnobj_new_from_image(PnBuffer *image, const char *location, const char *creator, PnMsnObjType type) @@ -196,7 +196,7 @@ pn_msnobj_free(PnMsnObj *obj) g_free(obj->sha1d); g_free(obj->sha1c); - pecan_buffer_free(obj->image); + pn_buffer_free(obj->image); if (obj->local) local_objs = g_list_remove(local_objs, obj); @@ -254,9 +254,9 @@ pn_msnobj_get_sha1(const PnMsnObj *obj) void pn_msnobj_set_image(PnMsnObj *obj, - PecanBuffer *buffer) + PnBuffer *buffer) { - pecan_buffer_free(obj->image); + pn_buffer_free(obj->image); obj->image = buffer; } @@ -275,7 +275,7 @@ find_local(const gchar *sha1) return NULL; } -PecanBuffer * +PnBuffer * pn_msnobj_get_image(const PnMsnObj *obj) { PnMsnObj *local_obj; cvr/pn_msnobj.c @@ -24,7 +24,7 @@ typedef struct PnMsnObj PnMsnObj; -#include "io/pecan_buffer.h" +#include "io/pn_buffer.h" typedef enum { @@ -62,7 +62,7 @@ PnMsnObj *pn_msnobj_new_from_string(const gchar *str); * * @return A new PnMsnObj structure */ -PnMsnObj *pn_msnobj_new_from_image(PecanBuffer *image, +PnMsnObj *pn_msnobj_new_from_image(PnBuffer *image, const char *location, const char *creator, PnMsnObjType type); @@ -125,7 +125,7 @@ const gchar *pn_msnobj_get_sha1(const PnMsnObj *obj); * @param obj The object. * @param buffer The image to associate. */ -void pn_msnobj_set_image(PnMsnObj *obj, PecanBuffer *buffer); +void pn_msnobj_set_image(PnMsnObj *obj, PnBuffer *buffer); /** * Returns the image associated with the PnMsnObj. @@ -134,6 +134,6 @@ void pn_msnobj_set_image(PnMsnObj *obj, PecanBuffer *buffer); * * @return The associated image. */ -PecanBuffer *pn_msnobj_get_image(const PnMsnObj *obj); +PnBuffer *pn_msnobj_get_image(const PnMsnObj *obj); #endif /* PN_MSNOBJ_H */ cvr/pn_msnobj.h @@ -22,7 +22,7 @@ #include "slpcall.h" #include "slpmsg.h" #include "pn_log.h" -#include "io/pecan_buffer.h" +#include "io/pn_buffer.h" #include "xfer.h" @@ -173,7 +173,7 @@ got_sessionreq(MsnSlpCall *slpcall, MsnSlpMessage *slpmsg; PnMsnObj *obj; char *msnobj_data; - PecanBuffer *image; + PnBuffer *image; int type; /* Send Ok */ @@ -210,8 +210,8 @@ got_sessionreq(MsnSlpCall *slpcall, char *path; path = g_build_filename(purple_smileys_get_storing_dir(), pn_msnobj_get_location(obj), NULL); img = purple_imgstore_new_from_file(path); - image = pecan_buffer_new_memdup((const gpointer) purple_imgstore_get_data (img), - purple_imgstore_get_size (img)); + image = pn_buffer_new_memdup((const gpointer) purple_imgstore_get_data(img), + purple_imgstore_get_size(img)); purple_imgstore_unref(img); g_free(path); } cvr/slp.c @@ -106,7 +106,7 @@ msn_slpmsg_set_body(MsnSlpMessage *slpmsg, void msn_slpmsg_set_image(MsnSlpMessage *slpmsg, - PecanBuffer *image) + PnBuffer *image) { slpmsg->size = image->len; slpmsg->buffer = g_memdup(image->data, slpmsg->size); cvr/slpmsg.c @@ -29,7 +29,7 @@ struct MsnSession; struct MsnMessage; #include "slp.h" -#include "io/pecan_buffer.h" +#include "io/pn_buffer.h" #include <glib/gstdio.h> @@ -87,7 +87,8 @@ void msn_slpmsg_destroy(MsnSlpMessage *slpmsg); void msn_slpmsg_set_body(MsnSlpMessage *slpmsg, gconstpointer *body, guint64 size); -void msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PecanBuffer *image); +void msn_slpmsg_set_image(MsnSlpMessage *slpmsg, + PnBuffer *image); void msn_slpmsg_open_file(MsnSlpMessage *slpmsg, const char *file_name); MsnSlpMessage * msn_slpmsg_sip_new(struct MsnSlpCall *slpcall, int cseq, cvr/slpmsg.h @@ -21,7 +21,7 @@ #include <glib.h> -#include "pecan_buffer.h" +#include "pn_buffer.h" typedef struct MsnCmd MsnCmd; io/cmd.h @@ -1010,7 +1010,7 @@ msn_msg_grab_emoticons(const char *msg, const char *username) for (; smileys; smileys = g_list_delete_link(smileys, smileys)) { - PecanBuffer *buffer; + PnBuffer *buffer; smiley = smileys->data; ptr = g_strstr_len(msg, length, purple_smiley_get_shortcut(smiley)); @@ -1019,8 +1019,8 @@ msn_msg_grab_emoticons(const char *msg, const char *username) continue; image = purple_smiley_get_stored_image(smiley); - buffer = pecan_buffer_new_memdup ((const gpointer) purple_imgstore_get_data (image), - purple_imgstore_get_size (image)); + buffer = pn_buffer_new_memdup ((const gpointer) purple_imgstore_get_data (image), + purple_imgstore_get_size (image)); emoticon = g_new0(MsnEmoticon, 1); emoticon->smile = g_strdup(purple_smiley_get_shortcut(smiley)); @@ -1628,10 +1628,10 @@ set_buddy_icon (PurpleConnection *gc, user = msn_session_get_contact (session); { - PecanBuffer *image; + PnBuffer *image; if (img) - image = pecan_buffer_new_memdup ((const gpointer) purple_imgstore_get_data (img), - purple_imgstore_get_size (img)); + image = pn_buffer_new_memdup ((const gpointer) purple_imgstore_get_data (img), + purple_imgstore_get_size (img)); else image = NULL; pecan_contact_set_buddy_icon (user, image); msn.c @@ -157,7 +157,7 @@ request (PecanContact *user) if (my_obj) { - PecanBuffer *image; + PnBuffer *image; image = pn_msnobj_get_image (my_obj); data = image->data; len = image->len; pn_dp_manager.c @@ -416,9 +416,9 @@ msn_session_finish_login (MsnSession *session) img = purple_buddy_icons_find_account_icon (account); { - PecanBuffer *image; + PnBuffer *image; if (img) - image = pecan_buffer_new_memdup ((const gpointer) purple_imgstore_get_data (img), + image = pn_buffer_new_memdup ((const gpointer) purple_imgstore_get_data (img), purple_imgstore_get_size (img)); else image = NULL; session.c @@ -19,7 +19,7 @@ cmd_parser_test_objects := cmd_parser.o \ ../pn_log.o buffer_test_objects := buffer.o \ - ../io/pecan_buffer.o + ../io/pn_buffer.o ab_test_objects := ab.o \ ../ab/pecan_contact.o \ @@ -41,7 +41,7 @@ endif all: -check_buffer: buffer.o ../io/pecan_buffer.o +check_buffer: buffer.o ../io/pn_buffer.o check_buffer: CFLAGS := $(CFLAGS) $(GOBJECT_CFLAGS) $(CHECK_CFLAGS) check_buffer: LIBS := $(GOBJECT_LIBS) $(CHECK_LIBS) tests/Makefile @@ -19,7 +19,7 @@ #include <check.h> #include <glib.h> -#include "io/pecan_buffer.h" +#include "io/pn_buffer.h" #include <string.h> @@ -31,25 +31,25 @@ static guint times = 0x10; START_TEST (test_basic) { - PecanBuffer *buf; + PnBuffer *buf; - buf = pecan_buffer_new (); - pecan_buffer_free (buf); + buf = pn_buffer_new (); + pn_buffer_free (buf); - buf = pecan_buffer_new_and_alloc (BUFFER_SIZE); - pecan_buffer_free (buf); + buf = pn_buffer_new_and_alloc (BUFFER_SIZE); + pn_buffer_free (buf); - buf = pecan_buffer_new (); - pecan_buffer_resize (buf, BUFFER_SIZE); - pecan_buffer_free (buf); + buf = pn_buffer_new (); + pn_buffer_resize (buf, BUFFER_SIZE); + pn_buffer_free (buf); - buf = pecan_buffer_new_and_alloc (BUFFER_SIZE); - pecan_buffer_resize (buf, 2 * BUFFER_SIZE); - pecan_buffer_free (buf); + buf = pn_buffer_new_and_alloc (BUFFER_SIZE); + pn_buffer_resize (buf, 2 * BUFFER_SIZE); + pn_buffer_free (buf); - buf = pecan_buffer_new_and_alloc (BUFFER_SIZE); - pecan_buffer_prepare (buf, 2 * BUFFER_SIZE); - pecan_buffer_free (buf); + buf = pn_buffer_new_and_alloc (BUFFER_SIZE); + pn_buffer_prepare (buf, 2 * BUFFER_SIZE); + pn_buffer_free (buf); } END_TEST @@ -57,45 +57,45 @@ static void prepare_helper (guint times, gboolean write) { - PecanBuffer *buf; + PnBuffer *buf; guint i; - buf = pecan_buffer_new (); - pecan_buffer_free (buf); + buf = pn_buffer_new (); + pn_buffer_free (buf); - buf = pecan_buffer_new_and_alloc (BUFFER_SIZE); + buf = pn_buffer_new_and_alloc (BUFFER_SIZE); for (i = 0; i < times; i++) { - pecan_buffer_prepare (buf, i * BUFFER_SIZE); + pn_buffer_prepare (buf, i * BUFFER_SIZE); if (write) memset (buf->data, 0, buf->size); } - pecan_buffer_free (buf); + pn_buffer_free (buf); - buf = pecan_buffer_new (); - pecan_buffer_resize (buf, BUFFER_SIZE); + buf = pn_buffer_new (); + pn_buffer_resize (buf, BUFFER_SIZE); for (i = 0; i < times; i++) { - pecan_buffer_prepare (buf, i * BUFFER_SIZE); + pn_buffer_prepare (buf, i * BUFFER_SIZE); if (write) memset (buf->data, 0, buf->size); } - pecan_buffer_free (buf); + pn_buffer_free (buf); - buf = pecan_buffer_new_and_alloc (BUFFER_SIZE); + buf = pn_buffer_new_and_alloc (BUFFER_SIZE); for (i = 0; i < times; i++) { - pecan_buffer_prepare (buf, i * g_random_double ()); + pn_buffer_prepare (buf, i * g_random_double ()); if (write) memset (buf->data, 0, buf->size); } - pecan_buffer_free (buf); + pn_buffer_free (buf); - buf = pecan_buffer_new (); - pecan_buffer_resize (buf, BUFFER_SIZE); + buf = pn_buffer_new (); + pn_buffer_resize (buf, BUFFER_SIZE); for (i = 0; i < times; i++) { - pecan_buffer_prepare (buf, i * g_random_double ()); + pn_buffer_prepare (buf, i * g_random_double ()); if (write) memset (buf->data, 0, buf->size); } - pecan_buffer_free (buf); + pn_buffer_free (buf); } START_TEST (test_prepare) tests/buffer.c io/pecan_buffer.c io/pecan_buffer.h 22a5b1af4fc5c087c58846997e699ab0b646d9cf Felipe Contreras felipe.contreras@gmail.com http://github.com/felipec/msn-pecan/commit/88621c7d395e6029ebd805ed87b0c5d74810808c 88621c7d395e6029ebd805ed87b0c5d74810808c 2009-07-04T15:36:07-07:00 2009-06-20T02:50:48-07:00 Rename pn_buffer Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> 6a522545c995e02466bd2b12a53877f7c55accc5 Felipe Contreras felipe.contreras@gmail.com