From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 8 Dec 2008 10:41:08 +0000 (+0000)
Subject: tripe.h: Make job index be unsigned int, not unsigned short.
X-Git-Tag: 1.0.0pre8~63
X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/commitdiff_plain/cc921fbabd2a286aa3d1322c54419044f55cfcf2?hp=c8e02c8a4947afa4f9ac20e78a3c8808b3945804

tripe.h: Make job index be unsigned int, not unsigned short.

This is mainly (a) because we don't actually save space by using a
short, and (b) because it shuts up a compiler warning.

The warning is annoying.  The compiler complains that it has proven that
an assertion is always true.  Of course, it's nice when it can prove my
assertions, but they're /meant/ to be provably true!

This particular instance is particularly annoying, since it's only
/trivially/ true in the sense the compiler is warning about as a result
of a coincidence of data-type ranges, which may not hold on other
architectures -- on which the assertion is nontrivial but still
important.

Duh.
---

diff --git a/server/tripe.h b/server/tripe.h
index bf599774..43d2bdf9 100644
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -434,7 +434,7 @@ typedef struct admin_service {
 typedef struct admin_svcop {
   admin_bgop bg;			/* Background operation header */
   struct admin *prov;			/* Client servicing this job */
-  unsigned short index;			/* This job's index */
+  unsigned index;			/* This job's index */
   struct admin_svcop *next, *prev;	/* Links for provider's jobs */
 } admin_svcop;