cd ../gtk ==> cd ../ui/gtk

[obnox/wireshark/wip.git] / epan / base64.c

diff --git a/epan/base64.c b/epan/base64.c
index 7a5966d8434b12b8bdff3c3b6ddd8f10d5a5cdee..949e995c0afa38f3fd0793bc6e75edf4af10b2e9 100644 (file)
--- a/epan/base64.c
+++ b/epan/base64.c
@@ -42,7 +42,7 @@ size_t epan_base64_decode(char *s)
        int  cr_idx;
 
        /* we will allow CR and LF - but ignore them */
-       cr_idx = strchr(b64, '\r') - b64;
+       cr_idx = (int) (strchr(b64, '\r') - b64);
 
        i=0;
 
@@ -71,16 +71,16 @@ size_t epan_base64_decode(char *s)
    string */
 
 tvbuff_t *
-base64_to_tvb(const char *base64)
+base64_to_tvb(tvbuff_t *parent, const char *base64)
 {
   tvbuff_t *tvb;
   char *data = g_strdup(base64);
-  size_t len;
+  gint len;
 
-  len = epan_base64_decode(data);
-  tvb = tvb_new_real_data((const guint8 *)data, len, len);
+  len = (gint) epan_base64_decode(data);
+  tvb = tvb_new_child_real_data(parent, (const guint8 *)data, len, len);
 
   tvb_set_free_cb(tvb, g_free);
 
   return tvb;
-}
\ No newline at end of file
+}