GNOME.org
 

gmime r1292 - trunk/gmime

Author: fejj
Date: Wed May 28 02:12:50 2008
New Revision: 1292
URL: http://svn.gnome.org/viewvc/gmime?rev=1292&view=rev

Log:
changed param names 'string' to 'str' to make bindings easier

Modified:
   trunk/gmime/gmime-iconv-utils.c
   trunk/gmime/gmime-iconv-utils.h
   trunk/gmime/gmime-message.c
   trunk/gmime/gmime-message.h
   trunk/gmime/gmime-param.c
   trunk/gmime/gmime-param.h
   trunk/gmime/gmime-stream.c
   trunk/gmime/gmime-stream.h
   trunk/gmime/internet-address.c
   trunk/gmime/internet-address.h

Modified: trunk/gmime/gmime-iconv-utils.c
==============================================================================
--- trunk/gmime/gmime-iconv-utils.c	(original)
+++ trunk/gmime/gmime-iconv-utils.c	Wed May 28 02:12:50 2008
@@ -88,19 +88,19 @@
 /**
  * g_mime_iconv_strndup:
  * @cd: conversion descriptor
- * @string: string in source charset
+ * @str: string in source charset
  * @n: number of bytes to convert
  *
- * Allocates a new string buffer containing the first @n bytes of
- * @string converted to the destination charset as described by the
- * conversion descriptor @cd.
+ * Allocates a new string buffer containing the first @n bytes of @str
+ * converted to the destination charset as described by the conversion
+ * descriptor @cd.
  *
  * Returns a new string buffer containing the first @n bytes of
- * @string converted to the destination charset as described by the
+ * @str converted to the destination charset as described by the
  * conversion descriptor @cd.
  **/
 char *
-g_mime_iconv_strndup (iconv_t cd, const char *string, size_t n)
+g_mime_iconv_strndup (iconv_t cd, const char *str, size_t n)
 {
 	size_t inleft, outleft, converted = 0;
 	char *out, *outbuf;
@@ -109,12 +109,12 @@
 	int errnosav;
 	
 	if (cd == (iconv_t) -1)
-		return g_strndup (string, n);
+		return g_strndup (str, n);
 	
 	outlen = n * 2 + 16;
 	out = g_malloc (outlen + 4);
 	
-	inbuf = string;
+	inbuf = str;
 	inleft = n;
 	
 	do {
@@ -185,38 +185,38 @@
 /**
  * g_mime_iconv_strdup:
  * @cd: conversion descriptor
- * @string: string in source charset
+ * @str: string in source charset
  *
- * Allocates a new string buffer containing @string converted to
- * the destination charset described in @cd.
+ * Allocates a new string buffer containing @str converted to the
+ * destination charset described in @cd.
  *
  * Returns a new string buffer containing the original string
  * converted to the new charset.
  **/
 char *
-g_mime_iconv_strdup (iconv_t cd, const char *string)
+g_mime_iconv_strdup (iconv_t cd, const char *str)
 {
-	return g_mime_iconv_strndup (cd, string, strlen (string));
+	return g_mime_iconv_strndup (cd, str, strlen (str));
 }
 
 
 /**
  * g_mime_iconv_locale_to_utf8:
- * @string: string in locale charset
+ * @str: string in locale charset
  *
- * Allocates a new string buffer containing @string in UTF-8.
+ * Allocates a new string buffer containing @str in UTF-8.
  *
- * Returns a new string buffer containing @string converted to UTF-8.
+ * Returns a new string buffer containing @str converted to UTF-8.
  **/
 char *
-g_mime_iconv_locale_to_utf8 (const char *string)
+g_mime_iconv_locale_to_utf8 (const char *str)
 {
 	char *buf;
 	
 	LOCK ();
 	iconv_utils_init ();
 	
-	buf = g_mime_iconv_strdup (locale_to_utf8, string);
+	buf = g_mime_iconv_strdup (locale_to_utf8, str);
 	UNLOCK ();
 	
 	return buf;
@@ -225,24 +225,24 @@
 
 /**
  * g_mime_iconv_locale_to_utf8_length:
- * @string: string in locale charset
+ * @str: string in locale charset
  * @n: number of bytes to convert
  *
  * Allocates a new string buffer containing the first @n bytes of
- * @string converted to UTF-8.
+ * @str converted to UTF-8.
  *
  * Returns a new string buffer containing the first @n bytes of
- * @string converted to UTF-8.
+ * @str converted to UTF-8.
  **/
 char *
-g_mime_iconv_locale_to_utf8_length (const char *string, size_t n)
+g_mime_iconv_locale_to_utf8_length (const char *str, size_t n)
 {
 	char *buf;
 	
 	LOCK ();
 	iconv_utils_init ();
 	
-	buf = g_mime_iconv_strndup (locale_to_utf8, string, n);
+	buf = g_mime_iconv_strndup (locale_to_utf8, str, n);
 	UNLOCK ();
 	
 	return buf;
@@ -251,23 +251,23 @@
 
 /**
  * g_mime_iconv_utf8_to_locale:
- * @string: string in UTF-8 charset
+ * @str: string in UTF-8 charset
  *
- * Allocates a new string buffer containing @string converted to the
+ * Allocates a new string buffer containing @str converted to the
  * user's locale charset.
  *
- * Returns a new string buffer containing @string converted to the
+ * Returns a new string buffer containing @str converted to the
  * user's locale charset.
  **/
 char *
-g_mime_iconv_utf8_to_locale (const char *string)
+g_mime_iconv_utf8_to_locale (const char *str)
 {
 	char *buf;
 	
 	LOCK ();
 	iconv_utils_init ();
 	
-	buf = g_mime_iconv_strdup (utf8_to_locale, string);
+	buf = g_mime_iconv_strdup (utf8_to_locale, str);
 	UNLOCK ();
 	
 	return buf;
@@ -276,24 +276,24 @@
 
 /**
  * g_mime_iconv_utf8_to_locale_length:
- * @string: string in UTF-8 charset
+ * @str: string in UTF-8 charset
  * @n: number of bytes to convert
  *
  * Allocates a new string buffer containing the first @n bytes of
- * @string converted to the user's locale charset.
+ * @str converted to the user's locale charset.
  *
  * Returns a new string buffer containing the first @n bytes of
- * @string converted to the user's locale charset.
+ * @str converted to the user's locale charset.
  **/
 char *
-g_mime_iconv_utf8_to_locale_length (const char *string, size_t n)
+g_mime_iconv_utf8_to_locale_length (const char *str, size_t n)
 {
 	char *buf;
 	
 	LOCK ();
 	iconv_utils_init ();
 	
-	buf = g_mime_iconv_strndup (utf8_to_locale, string, n);
+	buf = g_mime_iconv_strndup (utf8_to_locale, str, n);
 	UNLOCK ();
 	
 	return buf;

Modified: trunk/gmime/gmime-iconv-utils.h
==============================================================================
--- trunk/gmime/gmime-iconv-utils.h	(original)
+++ trunk/gmime/gmime-iconv-utils.h	Wed May 28 02:12:50 2008
@@ -29,14 +29,14 @@
 
 G_BEGIN_DECLS
 
-char *g_mime_iconv_strdup (iconv_t cd, const char *string);
-char *g_mime_iconv_strndup (iconv_t cd, const char *string, size_t n);
+char *g_mime_iconv_strdup (iconv_t cd, const char *str);
+char *g_mime_iconv_strndup (iconv_t cd, const char *str, size_t n);
 
-char *g_mime_iconv_locale_to_utf8 (const char *string);
-char *g_mime_iconv_locale_to_utf8_length (const char *string, size_t n);
+char *g_mime_iconv_locale_to_utf8 (const char *str);
+char *g_mime_iconv_locale_to_utf8_length (const char *str, size_t n);
 
-char *g_mime_iconv_utf8_to_locale (const char *string);
-char *g_mime_iconv_utf8_to_locale_length (const char *string, size_t n);
+char *g_mime_iconv_utf8_to_locale (const char *str);
+char *g_mime_iconv_utf8_to_locale_length (const char *str, size_t n);
 
 G_END_DECLS
 

Modified: trunk/gmime/gmime-message.c
==============================================================================
--- trunk/gmime/gmime-message.c	(original)
+++ trunk/gmime/gmime-message.c	Wed May 28 02:12:50 2008
@@ -58,7 +58,7 @@
 static char *message_get_headers (GMimeObject *object);
 static ssize_t message_write_to_stream (GMimeObject *object, GMimeStream *stream);
 
-static void message_add_recipients_from_string (GMimeMessage *message, char *type, const char *string);
+static void message_add_recipients_from_string (GMimeMessage *message, char *type, const char *str);
 
 static ssize_t write_structured (GMimeStream *stream, const char *name, const char *value);
 static ssize_t write_addrspec (GMimeStream *stream, const char *name, const char *value);
@@ -1038,14 +1038,14 @@
 
 
 static void
-message_add_recipients_from_string (GMimeMessage *message, char *type, const char *string)
+message_add_recipients_from_string (GMimeMessage *message, char *type, const char *str)
 {
 	InternetAddressList *recipients, *addrlist;
 	
 	recipients = g_hash_table_lookup (message->recipients, type);
 	g_hash_table_remove (message->recipients, type);
 	
-	if ((addrlist = internet_address_parse_string (string))) {
+	if ((addrlist = internet_address_parse_string (str))) {
 		recipients = internet_address_list_concat (recipients, addrlist);
 		internet_address_list_destroy (addrlist);
 	}
@@ -1058,7 +1058,7 @@
  * g_mime_message_add_recipients_from_string:
  * @message: MIME Message
  * @type: Recipient type
- * @string: A string of recipient names and addresses.
+ * @str: A string of recipient names and addresses.
  *
  * Add a list of recipients of a chosen type to the MIME
  * Message. Available recipient types include:
@@ -1067,13 +1067,13 @@
  * specified in rfc822.
  **/
 void
-g_mime_message_add_recipients_from_string (GMimeMessage *message, char *type, const char *string)
+g_mime_message_add_recipients_from_string (GMimeMessage *message, char *type, const char *str)
 {
 	g_return_if_fail (GMIME_IS_MESSAGE (message));
 	g_return_if_fail (type != NULL);
-	g_return_if_fail (string != NULL);
+	g_return_if_fail (str != NULL);
 	
-	message_add_recipients_from_string (message, type, string);
+	message_add_recipients_from_string (message, type, str);
 	
 	sync_recipient_header (message, type);
 }

Modified: trunk/gmime/gmime-message.h
==============================================================================
--- trunk/gmime/gmime-message.h	(original)
+++ trunk/gmime/gmime-message.h	Wed May 28 02:12:50 2008
@@ -102,7 +102,7 @@
 const char *g_mime_message_get_reply_to (GMimeMessage *message);
 
 void g_mime_message_add_recipient (GMimeMessage *message, char *type, const char *name, const char *address);
-void g_mime_message_add_recipients_from_string (GMimeMessage *message, char *type, const char *string);
+void g_mime_message_add_recipients_from_string (GMimeMessage *message, char *type, const char *str);
 const InternetAddressList *g_mime_message_get_recipients (GMimeMessage *message, const char *type);
 InternetAddressList *g_mime_message_get_all_recipients (GMimeMessage *message);
 

Modified: trunk/gmime/gmime-param.c
==============================================================================
--- trunk/gmime/gmime-param.c	(original)
+++ trunk/gmime/gmime-param.c	Wed May 28 02:12:50 2008
@@ -65,7 +65,7 @@
 
 
 /**
- * g_mime_param_new: Create a new MIME Param object
+ * g_mime_param_new:
  * @name: parameter name
  * @value: parameter value
  *
@@ -608,24 +608,24 @@
 
 
 /**
- * g_mime_param_new_from_string: Create a new MIME Param object
- * @string: input string
+ * g_mime_param_new_from_string:
+ * @str: input string
  *
  * Creates a parameter list based on the input string.
  *
  * Returns a #GMimeParam structure based on @string.
  **/
 GMimeParam *
-g_mime_param_new_from_string (const char *string)
+g_mime_param_new_from_string (const char *str)
 {
-	g_return_val_if_fail (string != NULL, NULL);
+	g_return_val_if_fail (str != NULL, NULL);
 	
-	return decode_param_list (string);
+	return decode_param_list (str);
 }
 
 
 /**
- * g_mime_param_destroy: Destroy the MIME Param
+ * g_mime_param_destroy:
  * @param: Mime param list to destroy
  *
  * Releases all memory used by this mime param back to the Operating
@@ -911,7 +911,7 @@
  * g_mime_param_write_to_string:
  * @param: MIME Param list
  * @fold: specifies whether or not to fold headers
- * @string: output string
+ * @str: output string
  *
  * Assumes the output string contains only the Content-* header and
  * it's immediate value.
@@ -919,9 +919,9 @@
  * Writes the params out to the string @string.
  **/
 void
-g_mime_param_write_to_string (GMimeParam *param, gboolean fold, GString *string)
+g_mime_param_write_to_string (GMimeParam *param, gboolean fold, GString *str)
 {
-	g_return_if_fail (string != NULL);
+	g_return_if_fail (str != NULL);
 	
-	param_list_format (string, param, fold);
+	param_list_format (str, param, fold);
 }

Modified: trunk/gmime/gmime-param.h
==============================================================================
--- trunk/gmime/gmime-param.h	(original)
+++ trunk/gmime/gmime-param.h	Wed May 28 02:12:50 2008
@@ -45,13 +45,13 @@
 
 
 GMimeParam *g_mime_param_new (const char *name, const char *value);
-GMimeParam *g_mime_param_new_from_string (const char *string);
+GMimeParam *g_mime_param_new_from_string (const char *str);
 void g_mime_param_destroy (GMimeParam *param);
 
 GMimeParam *g_mime_param_append (GMimeParam *params, const char *name, const char *value);
 GMimeParam *g_mime_param_append_param (GMimeParam *params, GMimeParam *param);
 
-void g_mime_param_write_to_string (GMimeParam *param, gboolean fold, GString *string);
+void g_mime_param_write_to_string (GMimeParam *param, gboolean fold, GString *str);
 
 G_END_DECLS
 

Modified: trunk/gmime/gmime-stream.c
==============================================================================
--- trunk/gmime/gmime-stream.c	(original)
+++ trunk/gmime/gmime-stream.c	Wed May 28 02:12:50 2008
@@ -465,19 +465,19 @@
 /**
  * g_mime_stream_write_string:
  * @stream: stream
- * @string: string to write
+ * @str: string to write
  *
  * Writes @string to @stream.
  *
  * Returns the number of bytes written or %-1 on fail.
  **/
 ssize_t
-g_mime_stream_write_string (GMimeStream *stream, const char *string)
+g_mime_stream_write_string (GMimeStream *stream, const char *str)
 {
 	g_return_val_if_fail (GMIME_IS_STREAM (stream), -1);
-	g_return_val_if_fail (string != NULL, -1);
+	g_return_val_if_fail (str != NULL, -1);
 	
-	return g_mime_stream_write (stream, (char *) string, strlen (string));
+	return g_mime_stream_write (stream, (char *) str, strlen (str));
 }
 
 

Modified: trunk/gmime/gmime-stream.h
==============================================================================
--- trunk/gmime/gmime-stream.h	(original)
+++ trunk/gmime/gmime-stream.h	Wed May 28 02:12:50 2008
@@ -118,7 +118,7 @@
 
 void      g_mime_stream_set_bounds (GMimeStream *stream, gint64 start, gint64 end);
 
-ssize_t   g_mime_stream_write_string (GMimeStream *stream, const char *string);
+ssize_t   g_mime_stream_write_string (GMimeStream *stream, const char *str);
 ssize_t   g_mime_stream_printf       (GMimeStream *stream, const char *fmt, ...) G_GNUC_PRINTF (2, 3);
 
 ssize_t   g_mime_stream_write_to_stream (GMimeStream *src, GMimeStream *dest);

Modified: trunk/gmime/internet-address.c
==============================================================================
--- trunk/gmime/internet-address.c	(original)
+++ trunk/gmime/internet-address.c	Wed May 28 02:12:50 2008
@@ -1004,7 +1004,7 @@
 
 /**
  * internet_address_parse_string:
- * @string: a string containing internet addresses
+ * @str: a string containing internet addresses
  *
  * Construct a list of internet addresses from the given string.
  *
@@ -1012,12 +1012,10 @@
  * the caller.
  **/
 InternetAddressList *
-internet_address_parse_string (const char *string)
+internet_address_parse_string (const char *str)
 {
 	InternetAddressList *node, *tail, *addrlist = NULL;
-	const char *inptr;
-	
-	inptr = string;
+	const char *inptr = str;
 	
 	tail = (InternetAddressList *) &addrlist;
 	

Modified: trunk/gmime/internet-address.h
==============================================================================
--- trunk/gmime/internet-address.h	(original)
+++ trunk/gmime/internet-address.h	Wed May 28 02:12:50 2008
@@ -102,7 +102,7 @@
 int internet_address_list_length (const InternetAddressList *list);
 void internet_address_list_destroy (InternetAddressList *list);
 
-InternetAddressList *internet_address_parse_string (const char *string);
+InternetAddressList *internet_address_parse_string (const char *str);
 
 char *internet_address_to_string (const InternetAddress *ia, gboolean encode);
 char *internet_address_list_to_string (const InternetAddressList *list, gboolean encode);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]