X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fgssd%2Fcacheio.c;h=f47f1fa9d9be936713dd556163f7dad09f881ab8;hp=f2f2960ca3491685d0285a60be457ed52b042ccc;hb=44f7f2f92038572663acf22b4fd8dc34640c8c81;hpb=8fd9fad1ea4b25b8962d70133f476650ef0637b0 diff --git a/utils/gssd/cacheio.c b/utils/gssd/cacheio.c index f2f2960..f47f1fa 100644 --- a/utils/gssd/cacheio.c +++ b/utils/gssd/cacheio.c @@ -132,6 +132,17 @@ void qword_addint(char **bpp, int *lp, int n) *lp -= len; } +void qword_adduint(char **bpp, int *lp, unsigned int n) +{ + int len; + + len = snprintf(*bpp, *lp, "%u ", n); + if (len > *lp) + len = *lp; + *bpp += len; + *lp -= len; +} + void qword_addeol(char **bpp, int *lp) { if (*lp <= 0) @@ -142,17 +153,12 @@ void qword_addeol(char **bpp, int *lp) } static char qword_buf[8192]; -static char tmp_buf[8192]; void qword_print(FILE *f, char *str) { char *bp = qword_buf; int len = sizeof(qword_buf); qword_add(&bp, &len, str); fwrite(qword_buf, bp-qword_buf, 1, f); - /* XXX: */ - memcpy(tmp_buf, qword_buf, bp-qword_buf); - tmp_buf[bp-qword_buf] = '\0'; - printerr(2, "%s", tmp_buf); } void qword_printhex(FILE *f, char *str, int slen) @@ -161,16 +167,11 @@ void qword_printhex(FILE *f, char *str, int slen) int len = sizeof(qword_buf); qword_addhex(&bp, &len, str, slen); fwrite(qword_buf, bp-qword_buf, 1, f); - /* XXX: */ - memcpy(tmp_buf, qword_buf, bp-qword_buf); - tmp_buf[bp-qword_buf] = '\0'; - printerr(2, "%s", tmp_buf); } void qword_printint(FILE *f, int num) { fprintf(f, "%d ", num); - printerr(2, "%d ", num); } int qword_eol(FILE *f) @@ -178,7 +179,6 @@ int qword_eol(FILE *f) int err; fprintf(f,"\n"); err = fflush(f); - printerr(2, "\n"); return err; }