From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; However since the OCaml bindings use guestfs_safe_strdup we need to export that (in the private functions section) from guestfs.h. --- generator/generator_c.ml | 2 ++ ocaml/guestfs_c.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/generator_c.ml b/generator/generator_c.ml index 4324ec0..daa5c5b 100644 --- a/generator/generator_c.ml +++ b/generator/generator_c.ml @@ -625,6 +625,8 @@ extern void *guestfs_next_private (guestfs_h *g, const char **key_rtn); extern void *guestfs_safe_malloc (guestfs_h *g, size_t nbytes); extern void *guestfs_safe_calloc (guestfs_h *g, size_t n, size_t s); extern const char *guestfs_tmpdir (void); +extern char *guestfs_safe_strdup (guestfs_h *g, const char *str); +extern void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size); #ifdef GUESTFS_PRIVATE_FOR_EACH_DISK extern int guestfs___for_each_disk (guestfs_h *g, virDomainPtr dom, int (*)(guestfs_h *g, const char *filename, const char *format, int readonly, void *data), void *data); #endif diff --git a/ocaml/guestfs_c.h b/ocaml/guestfs_c.h index a374bf2..2bcd577 100644 --- a/ocaml/guestfs_c.h +++ b/ocaml/guestfs_c.h @@ -19,8 +19,6 @@ #ifndef GUESTFS_OCAML_C_H #define GUESTFS_OCAML_C_H -#include "guestfs-internal.h" - #define Guestfs_val(v) (*((guestfs_h **)Data_custom_val(v))) extern void ocaml_guestfs_raise_error (guestfs_h *g, const char *func) Noreturn; -- 1.7.6

Richard W.M. Jones wrote: ... Nice clean-up/simplification. Personally I'd find it easier to read/review if you split the two new lines that are longer than 80 columns. $(OCAMLMKLIB) -o mlguestfs \ libguestfsocaml_a-guestfs_c_actions.o \ libguestfsocaml_a-guestfs_c.o \ guestfs.cmo -L$(top_builddir)/src/.libs -lguestfs That also helps to see the common "libguestfsocaml_a-" prefix, which if there were 3 or more I'd suggest to factor it out and use GNU make's $(addprefix ...), assuming you already depend on GNU make. But, seeing the $< in other lines, maybe you do already. But see below... Oh. Actually, seeing this pair of long-named .o files again, and knowing that they are the components of an automake library, I realized that there should be an automake-provided variable for the pair of them, poked the generated Makefile and found this: am_libguestfsocaml_a_OBJECTS = \ libguestfsocaml_a-guestfs_c.$(OBJEXT) \ libguestfsocaml_a-guestfs_c_actions.$(OBJEXT) So you can simplify further by using $(am_libguestfsocaml_a_OBJECTS) in both of those rules.

From: "Richard W.M. Jones" <rjones(a)redhat.com&gt; http://gcc.gnu.org/wiki/Visibility --- configure.ac | 6 ++++ generator/generator_c.ml | 70 ++++++++++++++++++++++++--------------------- src/Makefile.am | 8 +++-- 3 files changed, 48 insertions(+), 36 deletions(-) diff --git a/configure.ac b/configure.ac index 6e42423..368346f 100644 --- a/configure.ac +++ b/configure.ac @@ -166,6 +166,12 @@ VERSION_SCRIPT_FLAGS=-Wl,--version-script= VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," AC_SUBST(VERSION_SCRIPT_FLAGS) +dnl Use -fvisibility=hidden by default in the library. +dnl http://gcc.gnu.org/wiki/Visibility +AS_IF([test -n "$GCC"], + [AC_SUBST([GCC_VISIBILITY_HIDDEN], [-fvisibility=hidden])], + [AC_SUBST([GCC_VISIBILITY_HIDDEN], [:])]) + dnl Check support for 64 bit file offsets. AC_SYS_LARGEFILE diff --git a/generator/generator_c.ml b/generator/generator_c.ml index daa5c5b..a18609f 100644 --- a/generator/generator_c.ml +++ b/generator/generator_c.ml @@ -39,12 +39,14 @@ let rec generate_prototype ?(extern = true) ?(static = false) ?(semicolon = true) ?(single_line = false) ?(indent = "") ?(newline = false) ?(in_daemon = false) + ?(dll_public = false) ?(prefix = "") ?(suffix = "") ?handle ?(optarg_proto = Dots) name (ret, args, optargs) = pr "%s" indent; if extern then pr "extern "; + if dll_public then pr "GUESTFS_DLL_PUBLIC "; if static then pr "static "; (match ret with | RErr @@ -378,6 +380,10 @@ extern \"C\" { # endif #endif /* GUESTFS_WARN_DEPRECATED */ +#if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 40000 /* gcc >= 4.0 */ +# define GUESTFS_DLL_PUBLIC __attribute__((visibility (\"default\"))) +#endif + /* The handle. */ #ifndef GUESTFS_TYPEDEF_H #define GUESTFS_TYPEDEF_H 1 @@ -385,13 +391,13 @@ typedef struct guestfs_h guestfs_h; #endif /* Connection management. */ -extern guestfs_h *guestfs_create (void); -extern void guestfs_close (guestfs_h *g); +extern GUESTFS_DLL_PUBLIC guestfs_h *guestfs_create (void); +extern GUESTFS_DLL_PUBLIC void guestfs_close (guestfs_h *g); /* Error handling. */ -extern const char *guestfs_last_error (guestfs_h *g); +extern GUESTFS_DLL_PUBLIC const char *guestfs_last_error (guestfs_h *g); #define LIBGUESTFS_HAVE_LAST_ERRNO 1 -extern int guestfs_last_errno (guestfs_h *g); +extern GUESTFS_DLL_PUBLIC int guestfs_last_errno (guestfs_h *g); #ifndef GUESTFS_TYPEDEF_ERROR_HANDLER_CB #define GUESTFS_TYPEDEF_ERROR_HANDLER_CB 1 @@ -403,11 +409,11 @@ typedef void (*guestfs_error_handler_cb) (guestfs_h *g, void *opaque, const char typedef void (*guestfs_abort_cb) (void) __attribute__((__noreturn__)); #endif -extern void guestfs_set_error_handler (guestfs_h *g, guestfs_error_handler_cb cb, void *opaque); -extern guestfs_error_handler_cb guestfs_get_error_handler (guestfs_h *g, void **opaque_rtn); +extern GUESTFS_DLL_PUBLIC void guestfs_set_error_handler (guestfs_h *g, guestfs_error_handler_cb cb, void *opaque); +extern GUESTFS_DLL_PUBLIC guestfs_error_handler_cb guestfs_get_error_handler (guestfs_h *g, void **opaque_rtn); -extern void guestfs_set_out_of_memory_handler (guestfs_h *g, guestfs_abort_cb); -extern guestfs_abort_cb guestfs_get_out_of_memory_handler (guestfs_h *g); +extern GUESTFS_DLL_PUBLIC void guestfs_set_out_of_memory_handler (guestfs_h *g, guestfs_abort_cb); +extern GUESTFS_DLL_PUBLIC guestfs_abort_cb guestfs_get_out_of_memory_handler (guestfs_h *g); /* Events. */ "; @@ -434,13 +440,9 @@ typedef void (*guestfs_event_callback) ( #endif #define LIBGUESTFS_HAVE_SET_EVENT_CALLBACK 1 -extern int guestfs_set_event_callback (guestfs_h *g, - guestfs_event_callback cb, - uint64_t event_bitmask, - int flags, - void *opaque); +extern GUESTFS_DLL_PUBLIC int guestfs_set_event_callback (guestfs_h *g, guestfs_event_callback cb, uint64_t event_bitmask, int flags, void *opaque); #define LIBGUESTFS_HAVE_DELETE_EVENT_CALLBACK 1 -extern void guestfs_delete_event_callback (guestfs_h *g, int event_handle); +extern GUESTFS_DLL_PUBLIC void guestfs_delete_event_callback (guestfs_h *g, int event_handle); /* Old-style event handling. */ #ifndef GUESTFS_TYPEDEF_LOG_MESSAGE_CB @@ -468,32 +470,32 @@ typedef void (*guestfs_close_cb) (guestfs_h *g, void *opaque); typedef void (*guestfs_progress_cb) (guestfs_h *g, void *opaque, int proc_nr, int serial, uint64_t position, uint64_t total); #endif -extern void guestfs_set_log_message_callback (guestfs_h *g, guestfs_log_message_cb cb, void *opaque) +extern GUESTFS_DLL_PUBLIC void guestfs_set_log_message_callback (guestfs_h *g, guestfs_log_message_cb cb, void *opaque) GUESTFS_DEPRECATED_BY(\"set_event_callback\"); -extern void guestfs_set_subprocess_quit_callback (guestfs_h *g, guestfs_subprocess_quit_cb cb, void *opaque) +extern GUESTFS_DLL_PUBLIC void guestfs_set_subprocess_quit_callback (guestfs_h *g, guestfs_subprocess_quit_cb cb, void *opaque) GUESTFS_DEPRECATED_BY(\"set_event_callback\"); -extern void guestfs_set_launch_done_callback (guestfs_h *g, guestfs_launch_done_cb cb, void *opaque) +extern GUESTFS_DLL_PUBLIC void guestfs_set_launch_done_callback (guestfs_h *g, guestfs_launch_done_cb cb, void *opaque) GUESTFS_DEPRECATED_BY(\"set_event_callback\"); #define LIBGUESTFS_HAVE_SET_CLOSE_CALLBACK 1 -extern void guestfs_set_close_callback (guestfs_h *g, guestfs_close_cb cb, void *opaque) +extern GUESTFS_DLL_PUBLIC void guestfs_set_close_callback (guestfs_h *g, guestfs_close_cb cb, void *opaque) GUESTFS_DEPRECATED_BY(\"set_event_callback\"); #define LIBGUESTFS_HAVE_SET_PROGRESS_CALLBACK 1 -extern void guestfs_set_progress_callback (guestfs_h *g, guestfs_progress_cb cb, void *opaque) +extern GUESTFS_DLL_PUBLIC void guestfs_set_progress_callback (guestfs_h *g, guestfs_progress_cb cb, void *opaque) GUESTFS_DEPRECATED_BY(\"set_event_callback\"); /* User cancellation. */ #define LIBGUESTFS_HAVE_USER_CANCEL 1 -extern void guestfs_user_cancel (guestfs_h *g); +extern GUESTFS_DLL_PUBLIC void guestfs_user_cancel (guestfs_h *g); /* Private data area. */ #define LIBGUESTFS_HAVE_SET_PRIVATE 1 -extern void guestfs_set_private (guestfs_h *g, const char *key, void *data); +extern GUESTFS_DLL_PUBLIC void guestfs_set_private (guestfs_h *g, const char *key, void *data); #define LIBGUESTFS_HAVE_GET_PRIVATE 1 -extern void *guestfs_get_private (guestfs_h *g, const char *key); +extern GUESTFS_DLL_PUBLIC void *guestfs_get_private (guestfs_h *g, const char *key); #define LIBGUESTFS_HAVE_FIRST_PRIVATE 1 -extern void *guestfs_first_private (guestfs_h *g, const char **key_rtn); +extern GUESTFS_DLL_PUBLIC void *guestfs_first_private (guestfs_h *g, const char **key_rtn); #define LIBGUESTFS_HAVE_NEXT_PRIVATE 1 -extern void *guestfs_next_private (guestfs_h *g, const char **key_rtn); +extern GUESTFS_DLL_PUBLIC void *guestfs_next_private (guestfs_h *g, const char **key_rtn); /* Structures. */ "; @@ -536,8 +538,8 @@ extern void *guestfs_next_private (guestfs_h *g, const char **key_rtn); pr " struct guestfs_%s *val;\n" typ; pr "};\n"; pr "\n"; - pr "extern void guestfs_free_%s (struct guestfs_%s *);\n" typ typ; - pr "extern void guestfs_free_%s_list (struct guestfs_%s_list *);\n" typ typ; + pr "extern GUESTFS_DLL_PUBLIC void guestfs_free_%s (struct guestfs_%s *);\n" typ typ; + pr "extern GUESTFS_DLL_PUBLIC void guestfs_free_%s_list (struct guestfs_%s_list *);\n" typ typ; pr "\n" ) structs; @@ -569,7 +571,7 @@ extern void *guestfs_next_private (guestfs_h *g, const char **key_rtn); ) optargs; ); - generate_prototype ~single_line:true ~semicolon:false + generate_prototype ~single_line:true ~semicolon:false ~dll_public:true ~handle:"g" ~prefix:"guestfs_" shortname style; (match deprecated with | Some fn -> pr "\n GUESTFS_DEPRECATED_BY (%S);\n" fn @@ -579,6 +581,7 @@ extern void *guestfs_next_private (guestfs_h *g, const char **key_rtn); if optargs <> [] then ( generate_prototype ~single_line:true ~newline:true ~handle:"g" ~prefix:"guestfs_" ~suffix:"_va" ~optarg_proto:VA + ~dll_public:true shortname style; pr "\n"; @@ -608,6 +611,7 @@ extern void *guestfs_next_private (guestfs_h *g, const char **key_rtn); generate_prototype ~single_line:true ~newline:true ~handle:"g" ~prefix:"guestfs_" ~suffix:"_argv" ~optarg_proto:Argv + ~dll_public:true shortname style; ); @@ -622,13 +626,13 @@ extern void *guestfs_next_private (guestfs_h *g, const char **key_rtn); * time! We export them because they are used by some of the language * bindings. */ -extern void *guestfs_safe_malloc (guestfs_h *g, size_t nbytes); -extern void *guestfs_safe_calloc (guestfs_h *g, size_t n, size_t s); -extern const char *guestfs_tmpdir (void); -extern char *guestfs_safe_strdup (guestfs_h *g, const char *str); -extern void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size); +extern GUESTFS_DLL_PUBLIC void *guestfs_safe_malloc (guestfs_h *g, size_t nbytes); +extern GUESTFS_DLL_PUBLIC void *guestfs_safe_calloc (guestfs_h *g, size_t n, size_t s); +extern GUESTFS_DLL_PUBLIC char *guestfs_safe_strdup (guestfs_h *g, const char *str); +extern GUESTFS_DLL_PUBLIC void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size); +extern GUESTFS_DLL_PUBLIC const char *guestfs_tmpdir (void); #ifdef GUESTFS_PRIVATE_FOR_EACH_DISK -extern int guestfs___for_each_disk (guestfs_h *g, virDomainPtr dom, int (*)(guestfs_h *g, const char *filename, const char *format, int readonly, void *data), void *data); +extern GUESTFS_DLL_PUBLIC int guestfs___for_each_disk (guestfs_h *g, virDomainPtr dom, int (*)(guestfs_h *g, const char *filename, const char *format, int readonly, void *data), void *data); #endif /* End of private functions. */ diff --git a/src/Makefile.am b/src/Makefile.am index 28a1b92..b91ffc1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,7 +55,8 @@ lib_LTLIBRARIES = libguestfs.la # This convenience library is solely to compile its generated sources with # custom flags. libprotocol_la_SOURCES = guestfs_protocol.c guestfs_protocol.h -libprotocol_la_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing +libprotocol_la_CFLAGS = \ + -Wall -Wno-unused -fno-strict-aliasing $(GCC_VISIBILITY_HIDDEN) # Build the errnostring perfect hash code. The generated code has lots # of warnings so we must compile it in a separate mini-library. @@ -63,7 +64,7 @@ liberrnostring_la_SOURCES = \ errnostring_gperf.c \ errnostring.h \ errnostring.c -liberrnostring_la_CFLAGS = +liberrnostring_la_CFLAGS = $(GCC_VISIBILITY_HIDDEN) errnostring_gperf.c: errnostring_gperf.gperf rm -f $@ @@ -163,7 +164,8 @@ libguestfs_la_CFLAGS = \ -DGUESTFS_WARN_DEPRECATED=1 \ $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) $(PCRE_CFLAGS) \ $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(GCC_VISIBILITY_HIDDEN) libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib -- 1.7.6

On Wed, Jan 18, 2012 at 06:47:25PM +0100, Jim Meyering wrote: The reason is these contain generated code from rpcgen and gperf respectively which contains many problems. In particular we have to compile the rpcgen code with -fno-strict-aliasing. In both cases we don't want pages of warnings to appear that we can't do much about. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org