Commit Diff

Commit:
df7993f9c93b0fc5f4292f50df8b0949614967b5
From:
rsc <devnull@localhost>
Date:
Message:
handle opaque structs better
Actions:
Patch | Tree
commit - 3d991901316747fa00d754b2e93f71a41adb9d33
commit + df7993f9c93b0fc5f4292f50df8b0949614967b5
blob - 56dc33edefd00fead92d15b4f2dbccdc23b0d02b
blob + 309629ded14d26851e444f8d184b918d26905e71
--- src/cmd/acidtypes/type.c
+++ src/cmd/acidtypes/type.c
@@ -314,6 +314,8 @@ nilstrcmp(char *a, char *b)
 		return 1;
 	return strcmp(a, b);
 }
+
+int careaboutaggrcount;
 
 static int
 typecmp(Type *t, Type *u)
@@ -343,7 +345,7 @@ typecmp(Type *t, Type *u)
 	if(i)
 		return i;
 
-	if(t->ty == Aggr){
+	if(careaboutaggrcount && t->ty == Aggr){
 		if(t->n > u->n)
 			return -1;
 		if(t->n < u->n)
@@ -547,7 +549,9 @@ printtypes(Biobuf *b)
 	for(tl=alltypes; tl; tl=tl->tl)
 		all[n++] = tl->hd;
 
+	careaboutaggrcount = 1;
 	qsort(all, n, sizeof(all[0]), qtypecmp);
+	careaboutaggrcount = 0;
 
 	nn = 0;
 	for(i=0; i<n; i++){