X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgcharsetconverter.c;h=86be20e842e2bde7a2be089e02f35dd4e9959049;hb=174ebaefcc2b1b94f4a628e60f150b7209230dbf;hp=fe8fe69c943dfd3c58bf3723ffb4b14cf91bff24;hpb=434a4e1d250157b13d7036592f097c18fb8376b1;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gcharsetconverter.c b/gio/gcharsetconverter.c
index fe8fe69..86be20e 100644
--- a/gio/gcharsetconverter.c
+++ b/gio/gcharsetconverter.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
@@ -26,12 +24,10 @@
 
 #include <errno.h>
 
-#include "gcontenttypeprivate.h"
 #include "ginitable.h"
 #include "gioerror.h"
 #include "glibintl.h"
 
-#include "gioalias.h"
 
 enum {
   PROP_0,
@@ -207,9 +203,9 @@ g_charset_converter_init (GCharsetConverter *local)
  * Since: 2.24
  **/
 GCharsetConverter *
-g_charset_converter_new (const gchar  *to_charset,
-			 const gchar  *from_charset,
-			 GError       **error)
+g_charset_converter_new (const gchar *to_charset,
+			 const gchar *from_charset,
+			 GError      **error)
 {
   GCharsetConverter *conv;
 
@@ -238,15 +234,15 @@ g_charset_converter_reset (GConverter *converter)
 }
 
 static GConverterResult
-g_charset_converter_convert (GConverter *converter,
-			     const void *inbuf,
-			     gsize       inbuf_size,
-			     void       *outbuf,
-			     gsize       outbuf_size,
-			     GConverterFlags flags,
-			     gsize      *bytes_read,
-			     gsize      *bytes_written,
-			     GError    **error)
+g_charset_converter_convert (GConverter       *converter,
+			     const void       *inbuf,
+			     gsize             inbuf_size,
+			     void             *outbuf,
+			     gsize             outbuf_size,
+			     GConverterFlags   flags,
+			     gsize            *bytes_read,
+			     gsize            *bytes_written,
+			     GError          **error)
 {
   GCharsetConverter  *conv;
   gsize res;
@@ -432,9 +428,9 @@ g_charset_converter_iface_init (GConverterIface *iface)
 }
 
 static gboolean
-g_charset_converter_initable_init (GInitable *initable,
-				   GCancellable *cancellable,
-				   GError  **error)
+g_charset_converter_initable_init (GInitable     *initable,
+				   GCancellable  *cancellable,
+				   GError       **error)
 {
   GCharsetConverter  *conv;
 
@@ -449,10 +445,9 @@ g_charset_converter_initable_init (GInitable *initable,
       return FALSE;
     }
 
-  conv->iconv =
-    g_iconv_open (conv->to, conv->from);
+  conv->iconv = g_iconv_open (conv->to, conv->from);
 
-  if (conv->iconv == NULL)
+  if (conv->iconv == (GIConv)-1)
     {
       if (errno == EINVAL)
 	g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
@@ -473,6 +468,3 @@ g_charset_converter_initable_iface_init (GInitableIface *iface)
 {
   iface->init = g_charset_converter_initable_init;
 }
-
-#define __G_CHARSET_CONVERTER_C__
-#include "gioaliasdef.c"