cleanup

[platform/upstream/glib.git] / glib / gbase64.h

diff --git a/glib/gbase64.h b/glib/gbase64.h
index 1aa2bff..4018f0d 100644 (file)
--- a/glib/gbase64.h
+++ b/glib/gbase64.h
@@ -9,41 +9,52 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_BASE64_H__
 #define __G_BASE64_H__
 
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
 
-gsize   g_base64_encode_step  (const guchar *in,
-                              gsize         len,
-                              gboolean      break_lines,
-                              char         *out,
-                              int          *state,
-                              int          *save);
-gsize   g_base64_encode_close (gboolean      break_lines,
-                              char         *out,
-                              int          *state,
-                              int          *save);
-char *  g_base64_encode       (const guchar *data,
-                              gsize         len);
-gsize   g_base64_decode_step  (const char   *in,
-                              gsize         len,
-                              guchar       *out,
-                              int          *state,
-                              guint        *save);
-guchar *g_base64_decode       (const char   *text,
-                              gsize        *out_len);
+GLIB_AVAILABLE_IN_ALL
+gsize   g_base64_encode_step    (const guchar *in,
+                                 gsize         len,
+                                 gboolean      break_lines,
+                                 gchar        *out,
+                                 gint         *state,
+                                 gint         *save);
+GLIB_AVAILABLE_IN_ALL
+gsize   g_base64_encode_close   (gboolean      break_lines,
+                                 gchar        *out,
+                                 gint         *state,
+                                 gint         *save);
+GLIB_AVAILABLE_IN_ALL
+gchar*  g_base64_encode         (const guchar *data,
+                                 gsize         len) G_GNUC_MALLOC;
+GLIB_AVAILABLE_IN_ALL
+gsize   g_base64_decode_step    (const gchar  *in,
+                                 gsize         len,
+                                 guchar       *out,
+                                 gint         *state,
+                                 guint        *save);
+GLIB_AVAILABLE_IN_ALL
+guchar *g_base64_decode         (const gchar  *text,
+                                 gsize        *out_len) G_GNUC_MALLOC;
+GLIB_AVAILABLE_IN_ALL
+guchar *g_base64_decode_inplace (gchar        *text,
+                                 gsize        *out_len);
+
 
 G_END_DECLS