From: Luis R. Rodriguez Date: Wed, 29 Oct 2008 10:41:55 +0000 (-0700) Subject: Remove some comments that no longer apply on intersect X-Git-Tag: v0.9^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=447310355e2e98150c062de84456a6be98ba46b1;p=platform%2Fupstream%2Fcrda.git Remove some comments that no longer apply on intersect Signed-off-by: Luis R. Rodriguez --- diff --git a/Makefile b/Makefile index e513bc4..10acbd1 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ Q=@ NQ=@echo endif -all: regulatory.bin warn crda +all: regulatory.bin warn crda intersect $(Q)$(MAKE) --no-print-directory -f Makefile verify regulatory.bin: dbparse.py db2bin.py key.priv.pem db.txt diff --git a/intersect.c b/intersect.c index 728c257..279d807 100644 --- a/intersect.c +++ b/intersect.c @@ -251,31 +251,17 @@ int main(int argc, char **argv) break; } - /* On our first iteration on the first valid rd for a country - * we take that rd as the first world regdomain. - * We only hit this on our first iteration of a valid rd */ if (!prev_world) { prev_world = rd; continue; } - /* this is the previous country's rd, we don't care about it, we - * only care about the resulting intersected world rd, which - * should now be stored in prev_world, so we update that here */ if (world) { free(prev_world); prev_world = world; - } /* else prev_world is set correctly, first run, - * it was set to the first valid rd which is not - * the world regdomain, no need to update it */ - + } - /* If this is our first time around prev_world is - * the first regdomain, and rd is the second. If - * this is our third time around prev_world is the - * previous intersected world regdom of the first - * two rds */ world = regdom_intersect(prev_world, rd); if (!world) { /* Could be something else but we'll live with this */