diff -r ddc35bb593ef -r 4124c37fd953 librazor/razor.c
--- a/librazor/razor.c	Sat Jun 28 19:22:55 2008 -0400
+++ b/librazor/razor.c	Sun Jun 29 17:32:19 2008 +0100
@@ -32,6 +32,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <fnmatch.h>
+#include <assert.h>
 
 #include "razor-internal.h"
 #include "razor.h"
@@ -127,6 +128,9 @@
 	struct array *array;
 	int fd;
 
+	assert (set != NULL);
+	assert (filename != NULL);
+
 	fd = open(filename, O_RDONLY);
 	if (fstat(fd, &stat) < 0)
 		return -1;
@@ -157,6 +161,9 @@
 	struct array *array;
 	int fd;
 
+	assert (set != NULL);
+	assert (filename != NULL);
+
 	fd = open(filename, O_RDONLY);
 	if (fstat(fd, &stat) < 0)
 		return -1;
@@ -186,6 +193,8 @@
 	struct array *a;
 	int i;
 
+	assert (set != NULL);
+
 	if (set->header) {
 		for (i = 0; set->header->sections[i].type; i++)
 			;
@@ -340,6 +349,9 @@
 	long n1, n2;
 	int res;
 
+	assert (s1 != NULL);
+	assert (s2 != NULL);
+
 	n1 = strtol(s1, (char **) &p1, 10);
 	n2 = strtol(s2, (char **) &p2, 10);
 
@@ -377,6 +389,9 @@
 	struct razor_package *p;
 	const char *name, *version, *arch;
 
+	assert (set != NULL);
+	assert (package != NULL);
+
 	pi = razor_package_iterator_create(set);
 	while (razor_package_iterator_next(pi, &p, &name, &version, &arch)) {
 		if (strcmp(package, name) == 0)
@@ -395,6 +410,9 @@
 {
 	const char *pool = set->details_string_pool.data;
 
+	assert (set != NULL);
+	assert (package != NULL);
+
 	if (summary != NULL)
 		*summary = &pool[package->summary];
 	if (description != NULL)
@@ -408,6 +426,8 @@
 RAZOR_EXPORT const char *
 razor_property_relation_to_string(struct razor_property *p)
 {
+	assert (p != NULL);
+
 	switch (p->flags & RAZOR_PROPERTY_RELATION_MASK) {
 	case RAZOR_PROPERTY_LESS:
 		return "<";
@@ -432,6 +452,8 @@
 RAZOR_EXPORT const char *
 razor_property_type_to_string(struct razor_property *p)
 {
+	assert (p != NULL);
+
 	switch (p->flags & RAZOR_PROPERTY_TYPE_MASK) {
 	case RAZOR_PROPERTY_REQUIRES:
 		return "requires";
@@ -454,6 +476,10 @@
 	const char *n, *pool = set->file_string_pool.data;
 	int len;
 
+	assert (set != NULL);
+	assert (dir != NULL);
+	assert (pattern != NULL);
+
 	e = (struct razor_entry *) set->files.data + dir->start;
 	do {
 		n = pool + e->name;
@@ -498,6 +524,8 @@
 	struct razor_entry *e;
 	char buffer[512], *p, *base;
 
+	assert (set != NULL);
+
 	if (pattern == NULL || !strcmp (pattern, "/")) {
 		buffer[0] = '\0';
 		list_dir(set, set->files.data, buffer, NULL);
@@ -585,6 +613,9 @@
 	uint32_t end;
 	char buffer[512];
 
+	assert (set != NULL);
+	assert (name != NULL);
+
 	package = razor_set_get_package(set, name);
 	/* TODO: we should return the error to the caller */
 	if (!package)
@@ -610,6 +641,9 @@
 	const char *name1, *name2, *version1, *version2, *arch1, *arch2;
 	int res;
 
+	assert (set != NULL);
+	assert (upstream != NULL);
+
 	pi1 = razor_package_iterator_create(set);
 	pi2 = razor_package_iterator_create(upstream);
 
@@ -663,6 +697,9 @@
 	struct razor_package_query *query;
 	struct razor_package_iterator *pi;
 
+	assert (set != NULL);
+	assert (next != NULL);
+
 	query = razor_package_query_create(set);
 	razor_set_diff(next, set, add_new_package, query);
 
@@ -683,6 +720,9 @@
 	struct razor_package_query *query;
 	struct razor_package_iterator *pi;
 
+	assert (set != NULL);
+	assert (next != NULL);
+
 	query = razor_package_query_create(next);
 	razor_set_diff(set, next, add_new_package, query);