X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Fff-varint.c;h=6a0d5be4a182e92020413d3eab85307e4e123e4d;hb=564be9c0adf9f5796b60f2727cecc9c7274f86ff;hp=d446f2431845dbd3e48ba4466595f31b6c2c1c45;hpb=0192d9f3a127c82b32131d26ed9b5fb5a90db723;p=libucw.git

diff --git a/ucw/ff-varint.c b/ucw/ff-varint.c
index d446f243..6a0d5be4 100644
--- a/ucw/ff-varint.c
+++ b/ucw/ff-varint.c
@@ -16,8 +16,8 @@
 
 u64 bget_varint_slow(struct fastbuf *b, u64 repl)
 {
-	uns h = bgetc(b);
-	uns l = varint_len(h);
+	uint h = bgetc(b);
+	uint l = varint_len(h);
 	byte buf[l];
 	buf[0] = h;
 	l--;
@@ -30,7 +30,7 @@ u64 bget_varint_slow(struct fastbuf *b, u64 repl)
 void bput_varint_slow(struct fastbuf *b, u64 u)
 {
 	byte buf[9];
-	uns l = varint_put(buf, u);
+	uint l = varint_put(buf, u);
 	bwrite(b, buf, l);
 }
 
@@ -55,9 +55,9 @@ int main(int argc, char **argv)
 		#undef F
 	};
 
-	uns func = ~0U;
+	uint func = ~0U;
 	if (argc > 1)
-		for (uns i = 0; i < ARRAY_SIZE(names); i++)
+		for (uint i = 0; i < ARRAY_SIZE(names); i++)
 			if (!strcasecmp(names[i], argv[1]))
 				func = i;
 	if (!~func) {
@@ -67,8 +67,8 @@ int main(int argc, char **argv)
 
 	struct fastbuf *b = fbgrow_create(8);
 	switch (func) {
-		uns u;
-		u64 r;
+		uint u;
+		uintmax_t r;
 		int i;
 		case FUNC_BGET_VARINT:
 			while (scanf("%x", &u) == 1)
@@ -78,14 +78,14 @@ int main(int argc, char **argv)
 				if (btell(b))
 					putchar(' ');
 				r = bget_varint_slow(b, ~0LLU);
-				printf("%llx", r);
+				printf("%jx", r);
 			}
 			putchar('\n');
 			break;
 
 		case FUNC_BPUT_VARINT:
 			i = 0;
-			while (scanf("%llx", &r) == 1)
+			while (scanf("%jx", &r) == 1)
 				bput_varint_slow(b, r);
 			fbgrow_rewind(b);
 			while (bpeekc(b) >= 0) {