1.1 --- a/librazor/razor.c	Fri Jun 20 15:10:34 2008 -0400
     1.2 +++ b/librazor/razor.c	Fri Jun 20 21:38:29 2008 -0400
     1.3 @@ -33,8 +33,8 @@
     1.4  #include <ctype.h>
     1.5  #include <fnmatch.h>
     1.6  
     1.7 +#include "razor-internal.h"
     1.8  #include "razor.h"
     1.9 -#include "razor-internal.h"
    1.10  
    1.11  void *
    1.12  zalloc(size_t size)
    1.13 @@ -423,7 +423,7 @@
    1.14  
    1.15  void
    1.16  razor_set_diff(struct razor_set *set, struct razor_set *upstream,
    1.17 -	       razor_package_callback_t callback, void *data)
    1.18 +	       razor_diff_callback_t callback, void *data)
    1.19  {
    1.20   	struct razor_package_iterator *pi1, *pi2;
    1.21   	struct razor_package *p1, *p2;
    1.22 @@ -446,9 +446,11 @@
    1.23  		}
    1.24  
    1.25  		if (p2 == NULL || res < 0)
    1.26 -			callback(name1, version1, NULL, arch1, data);
    1.27 +			callback(RAZOR_DIFF_ACTION_REMOVE,
    1.28 +				 p1, name1, version1, arch1, data);
    1.29  		else if (p1 == NULL || res > 0)
    1.30 -			callback(name2, NULL, version2, arch2, data);
    1.31 +			callback(RAZOR_DIFF_ACTION_ADD,
    1.32 +				 p2, name2, version2, arch2, data);
    1.33  
    1.34  		if (p1 != NULL && res <= 0)
    1.35  			razor_package_iterator_next(pi1, &p1,