xbps_api.h -> xbps.h

bin/xbps-create/main.c

@@ -41,7 +41,7 @@
 #include <libgen.h>
 #include <locale.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "queue.h"
 
 #ifdef __clang__

bin/xbps-dgraph/main.c

@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 
 #ifdef __clang__
 #pragma clang diagnostic ignored "-Wformat-nonliteral"

bin/xbps-install/defs.h

@@ -27,7 +27,7 @@
 #define _XBPS_INSTALL_DEFS_H_
 
 #include <sys/time.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 struct xferstat {
 	struct timeval start;

bin/xbps-install/fetch_cb.c

@@ -40,7 +40,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 #include "config.h"
 

bin/xbps-install/main.c

@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 static void __attribute__((noreturn))

bin/xbps-install/state_cb.c

@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <syslog.h>
 #include <assert.h>
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 void

bin/xbps-install/transaction.c

@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct transaction {

bin/xbps-install/util.c

@@ -32,7 +32,7 @@
 #include <strings.h>
 #include <sys/ioctl.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 int

bin/xbps-pkgdb/check.c

@@ -33,7 +33,7 @@
 #include <pthread.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct thread_data {

bin/xbps-pkgdb/check_pkg_files.c

@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*

bin/xbps-pkgdb/check_pkg_rundeps.c

@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*

bin/xbps-pkgdb/check_pkg_symlinks.c

@@ -33,7 +33,7 @@
 #include <libgen.h>
 #include <sys/param.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*

bin/xbps-pkgdb/check_pkg_unneeded.c

@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*

bin/xbps-pkgdb/convert.c

@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*

bin/xbps-pkgdb/defs.h

@@ -27,7 +27,7 @@
 #define _XBPS_PKGDB_DEFS_H_
 
 #include <sys/time.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 /* from check.c */
 int	check_pkg_integrity(struct xbps_handle *, xbps_dictionary_t, const char *);

bin/xbps-pkgdb/main.c

@@ -31,7 +31,7 @@
 #include <getopt.h>
 #include <errno.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 static void __attribute__((noreturn))

bin/xbps-query/defs.h

@@ -26,7 +26,7 @@
 #ifndef _XBPS_QUERY_DEFS_H_
 #define _XBPS_QUERY_DEFS_H_
 
-#include <xbps_api.h>
+#include <xbps.h>
 
 #include "../xbps-install/defs.h"
 

bin/xbps-query/main.c

@@ -29,7 +29,7 @@
 #include <getopt.h>
 #include <errno.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 static void __attribute__((noreturn))

bin/xbps-query/ownedby.c

@@ -32,7 +32,7 @@
 #include <dirent.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct ffdata {

bin/xbps-query/search.c

@@ -41,7 +41,7 @@
 #include <fnmatch.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct search_data {

bin/xbps-query/show-deps.c

@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 static void

bin/xbps-query/show-info-files.c

@@ -33,7 +33,7 @@
 #include <fnmatch.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 static void

bin/xbps-reconfigure/main.c

@@ -31,7 +31,7 @@
 #include <getopt.h>
 #include <syslog.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 
 static void __attribute__((noreturn))
 usage(bool fail)

bin/xbps-remove/main.c

@@ -36,7 +36,7 @@
 #include <dirent.h>
 #include <syslog.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "../xbps-install/defs.h"
 
 static void __attribute__((noreturn))

bin/xbps-rindex/defs.h

@@ -26,7 +26,7 @@
 #ifndef _XBPS_RINDEX_DEFS_H_
 #define _XBPS_RINDEX_DEFS_H_
 
-#include <xbps_api.h>
+#include <xbps.h>
 
 /* From index-add.c */
 int	index_add(struct xbps_handle *, int, char **, bool);

bin/xbps-rindex/index-add.c

@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <fcntl.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*

bin/xbps-rindex/index-clean.c

@@ -35,7 +35,7 @@
 #include <pthread.h>
 #include <fcntl.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct thread_data {

bin/xbps-rindex/remove-obsoletes.c

@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <pthread.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct thread_data {

bin/xbps-rindex/repoflush.c

@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <fcntl.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 int

bin/xbps-uhelper/main.c

@@ -33,7 +33,7 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "../xbps-install/defs.h"
 
 static void

include/Makefile

@@ -1,6 +1,6 @@
 -include ../config.mk
 
-INCS =	xbps_api.h
+INCS =	xbps.h
 
 .PHONY: all
 all:

include/xbps_api_impl.h

@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <confuse.h>
 #define LIBXBPS_PRIVATE
-#include <xbps_api.h>
+#include <xbps.h>
 
 /*
  * By default all public functions have default visibility, unless

tests/libxbps/cmpver/main.c

@@ -25,7 +25,7 @@
  */
 
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 ATF_TC(cmpver_test);
 

tests/libxbps/find_pkg_obsoletes/main.c

@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 static void
 append_file(xbps_dictionary_t d, const char *key, const char *fpath)

tests/libxbps/find_pkg_orphans/main.c

@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 static const char expected_output[] =
 	"xbps-git-20130310_2\n"

tests/libxbps/pkgdb/main.c

@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 ATF_TC(pkgdb_get_pkg_test);
 ATF_TC_HEAD(pkgdb_get_pkg_test, tc)

tests/libxbps/pkgpattern_match/main.c

@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 ATF_TC(pkgpattern_match_test);
 

tests/libxbps/plist_match/main.c

@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 static xbps_array_t
 array_init(void)

tests/libxbps/plist_match_virtual/main.c

@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 static xbps_array_t
 rundeps_init(void)

tests/libxbps/util/main.c

@@ -25,7 +25,7 @@
  */
 #include <string.h>
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 ATF_TC(util_test);