lib: include assert per file, remove side effects from asserts

Author: Duncaen

bin/xbps-install/transaction.c

@@ -400,6 +400,7 @@ exec_transaction(struct xbps_handle *xhp, unsigned int maxcols, bool yes, bool d
 	trans->d = xhp->transd;
 	trans->iter = xbps_array_iter_from_dict(xhp->transd, "packages");
 	assert(trans->iter);
+	/* XXX: assert with side effect */
 
 	/*
 	 * dry-run mode, show what would be done but don't run anything.

include/xbps_api_impl.h

@@ -27,7 +27,6 @@
 #ifndef _XBPS_API_IMPL_H_
 #define _XBPS_API_IMPL_H_
 
-#include <assert.h>
 #include "xbps.h"
 
 /*

lib/archive.c

@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <assert.h> /* safe */
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>

lib/conf.c

@@ -29,14 +29,15 @@
 #ifdef __FreeBSD__
 #define _WITH_GETLINE   /* getline() */
 #endif
+
+#include <assert.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <glob.h>
 #include <libgen.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>

lib/download.c

@@ -30,17 +30,11 @@
  * $FreeBSD: src/usr.bin/fetch/fetch.c,v 1.84.2.1 2009/08/03 08:13:06 kensmith Exp $
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <assert.h> /* safe */
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/wait.h>
-#include <libgen.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <openssl/sha.h>
 

lib/external/dewey.c

@@ -28,6 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #define _BSD_SOURCE

lib/initend.c

@@ -25,6 +25,8 @@
  */
 
 #include <sys/utsname.h>
+
+#include <assert.h> /* safe */
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>

lib/package_alternatives.c

@@ -24,12 +24,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <assert.h>
+#include <errno.h>
+#include <libgen.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <libgen.h>
 
 #include "xbps_api_impl.h"
 

lib/package_config_files.c

@@ -23,6 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>

lib/package_configure.c

@@ -23,10 +23,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <assert.h> /* safe */
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
 #include "xbps_api_impl.h"
 /**
@@ -96,7 +97,7 @@ xbps_configure_pkg(struct xbps_handle *xhp,
 	pkg_state_t state = 0;
 	mode_t myumask;
 
-	assert(pkgver != NULL);
+	assert(pkgver);
 
 	if (!xbps_pkg_name(pkgname, sizeof(pkgname), pkgver)) {
 		p = pkgver;