X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fuse%2Fguestmount.c;h=739d8cbf87f11afd80b00b3eac8e09be6f7ee3ce;hb=825d855b225c7c76371c72eae4d505a32c374007;hp=c7220c0811c7f969c0a4cd35f993d4a8e3c6cb2e;hpb=9a8889e4d0c532b9f77af3a9cc7aae06adebfb83;p=libguestfs.git

diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index c7220c0..739d8cb 100644
--- a/fuse/guestmount.c
+++ b/fuse/guestmount.c
@@ -46,6 +46,7 @@
 
 #include "progname.h"
 
+#include "guestmount.h"
 #include "dircache.h"
 
 /* See <attr/xattr.h> */
@@ -53,21 +54,6 @@
 #define ENOATTR ENODATA
 #endif
 
-#ifdef HAVE_GETTEXT
-#include "gettext.h"
-#define _(str) dgettext(PACKAGE, (str))
-//#define N_(str) dgettext(PACKAGE, (str))
-#else
-#define _(str) str
-//#define N_(str) str
-#endif
-
-static inline char *
-bad_cast (char const *s)
-{
-  return (char *) s;
-}
-
 static guestfs_h *g = NULL;
 static int read_only = 0;
 int verbose = 0;
@@ -360,8 +346,10 @@ fg_readlink (const char *path, char *buf, size_t size)
   memcpy (buf, r, len);
   buf[len] = '\0';
 
-  if (free_it)
-    free ((char *) r);
+  if (free_it) {
+    char *tmp = (char *) r;
+    free (tmp);
+  }
 
   return 0;
 }