Make it clear it contains common code, and it is no more the final part
of some other source.

Signed-off-by: Pino Toscano <ptoscano@redhat.com>
---
 MANIFEST                                             |  2 +-
 libvirt/Makefile.in                                  | 10 +++++-----
 libvirt/README                                       |  2 +-
 libvirt/libvirt.mli                                  |  4 ++--
 libvirt/{libvirt_c_epilogue.c => libvirt_c_common.c} |  0
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename libvirt/{libvirt_c_epilogue.c => libvirt_c_common.c} (100%)

diff --git a/MANIFEST b/MANIFEST
index c026fef..b6a7707 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -20,7 +20,7 @@ install-sh
 libvirt/.depend
 libvirt/generator.pl
 libvirt/libvirt_c.h
-libvirt/libvirt_c_epilogue.c
+libvirt/libvirt_c_common.c
 libvirt/libvirt_c_oneoffs.c
 libvirt/libvirt.ml
 libvirt/libvirt.mli
diff --git a/libvirt/Makefile.in b/libvirt/Makefile.in
index d78056b..2fa445b 100644
--- a/libvirt/Makefile.in
+++ b/libvirt/Makefile.in
@@ -64,10 +64,10 @@ OPTOBJS := libvirt.cmx libvirt_version.cmx
 
 ifneq ($(OCAMLMKLIB),)
 # Good, we can just use ocamlmklib
-mllibvirt.cma: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_epilogue.o $(COBJS)
+mllibvirt.cma: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_common.o $(COBJS)
 	$(OCAMLMKLIB) -o mllibvirt $^ $(LDFLAGS)
 
-mllibvirt.cmxa: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_epilogue.o $(OPTOBJS)
+mllibvirt.cmxa: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_common.o $(OPTOBJS)
 	$(OCAMLMKLIB) -o mllibvirt $^ $(LDFLAGS)
 
 else
@@ -83,11 +83,11 @@ mllibvirt.cmxa: libmllibvirt.a $(OPTOBJS)
 	$(OCAMLOPT) -a -linkall -o $@ $(OPTOBJS) \
 	  -cclib -lmllibvirt -cclib "$(LDFLAGS)"
 
-dllmllibvirt.dll: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_epilogue.o
+dllmllibvirt.dll: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_common.o
 	$(CC) -shared -o $@ $^ \
 	  $(LDFLAGS) "$(shell ocamlc -where)"/ocamlrun.a
 
-libmllibvirt.a: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_epilogue.o
+libmllibvirt.a: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_common.o
 	ar rc $@ $^
 	ranlib $@
 
@@ -106,7 +106,7 @@ libvirt_generated.c: generator.pl
 # Extra dependencies.
 libvirt_generated.o: libvirt_c.h
 libvirt_c_oneoffs.o: libvirt_c.h
-libvirt_c_epilogue.o: libvirt_c.h
+libvirt_c_common.o: libvirt_c.h
 
 # Status of automatically generated bindings.
 autostatus: libvirt_generated.c
diff --git a/libvirt/README b/libvirt/README
index 197a07a..fb8e7f5 100644
--- a/libvirt/README
+++ b/libvirt/README
@@ -10,7 +10,7 @@ documentation starting at html/index.html.
 'libvirt_c.h' contains prototypes of common functions defined
 in the epilogue (see below), and provides some general macros.
 
-'libvirt_c_epilogue.c' contains some standard functions (eg.) for
+'libvirt_c_common.c' contains some standard functions (eg.) for
 wrapping and unwrapping libvirt objects.
 
 'libvirt_c_oneoffs.c' contains bindings which are too specialised or
diff --git a/libvirt/libvirt.mli b/libvirt/libvirt.mli
index 0739702..cbcf616 100644
--- a/libvirt/libvirt.mli
+++ b/libvirt/libvirt.mli
@@ -1485,7 +1485,7 @@ sig
     | VIR_ERR_NETWORK_PORT_EXIST
     | VIR_ERR_NO_NETWORK_PORT
 	(* ^^ NB: If you add a variant you MUST edit
-	   libvirt_c_epilogue.c:MAX_VIR_* *)
+	   libvirt_c_common.c:MAX_VIR_* *)
     | VIR_ERR_UNKNOWN of int (** Other error, not handled with existing values. *)
 	(** See [<libvirt/virterror.h>] for meaning of these codes. *)
 
@@ -1564,7 +1564,7 @@ sig
     | VIR_FROM_DOMAIN_CHECKPOINT
     | VIR_FROM_TPM
 	(* ^^ NB: If you add a variant you MUST edit
-	   libvirt_c_epilogue.c: MAX_VIR_* *)
+	   libvirt_c_common.c: MAX_VIR_* *)
     | VIR_FROM_UNKNOWN of int (** Other domain, not handled with existing values. *)
 	(** Subsystem / driver which produced the error. *)
 
diff --git a/libvirt/libvirt_c_epilogue.c b/libvirt/libvirt_c_common.c
similarity index 100%
rename from libvirt/libvirt_c_epilogue.c
rename to libvirt/libvirt_c_common.c
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

This is all fine.  Should we try to use a linker script
to hide the public symbols from patch 2?

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Tuesday, 3 September 2019 13:04:14 CEST Richard W.M. Jones wrote:
> This is all fine.  Should we try to use a linker script
> to hide the public symbols from patch 2?

Makes sense -- let me post a followup.

Thanks,
-- 
Pino Toscano--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list