From 81c16ad5b4369cda3ddbc1e7bf071e52ae4c2623 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 2 May 2011 14:09:29 +0000 Subject: utils/vlna: Avoid compiler warnings git-svn-id: svn://tug.org/texlive/trunk@22284 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/vlna/ChangeLog | 5 +++++ Build/source/utils/vlna/vlna.c | 6 +++--- Build/source/utils/vlna/vlna.w | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Build/source/utils/vlna/ChangeLog b/Build/source/utils/vlna/ChangeLog index 90598edeca0..b301a8b245a 100644 --- a/Build/source/utils/vlna/ChangeLog +++ b/Build/source/utils/vlna/ChangeLog @@ -1,3 +1,8 @@ +2011-05-02 Peter Breitenlohner + + * vlna.w (hexnum, settiestr): Declare as static. + (settiestr): Dreop unused local variable 'c'. + 2011-04-27 Karl Berry * Import 1.5 from ftp://math.feld.cvut.cz/pub/olsak/vlna. diff --git a/Build/source/utils/vlna/vlna.c b/Build/source/utils/vlna/vlna.c index ab95587c8d1..83e07380fcf 100644 --- a/Build/source/utils/vlna/vlna.c +++ b/Build/source/utils/vlna/vlna.c @@ -139,14 +139,14 @@ fprintf(stderr, /*:6*//*10:*/ #line 174 "./vlna.w" -unsigned char hexnum(char c){ +static unsigned char hexnum(char c){ if(c>='0'&&c<='9')return c-'0'; if(c>='A'&&c<='F')return c-'A'+10; if(c>='a'&&c<='f')return c-'a'+10; printusage(),exit(BAD_OPTIONS); } -void settiestr(char*s){ -int i,j,c; +static void settiestr(char*s){ +int i,j; i= strlen(s); if((i> 2*MAXLEN)||i%2==1)printusage(),exit(BAD_OPTIONS); tiestrlen= i/2; diff --git a/Build/source/utils/vlna/vlna.w b/Build/source/utils/vlna/vlna.w index 6d1ff5c2536..08a7588ecc6 100644 --- a/Build/source/utils/vlna/vlna.w +++ b/Build/source/utils/vlna/vlna.w @@ -172,14 +172,14 @@ while (argc>1 && argv[1][0] == '-') { @ Vyřešíme konverzi kódu zapsaného za parametrem \.{-x} na string |tiestr|. @= -unsigned char hexnum(char c) { +static unsigned char hexnum(char c) { if (c >= '0' && c <= '9') return c - '0'; if (c >= 'A' && c <= 'F') return c - 'A' + 10; if (c >= 'a' && c <= 'f') return c - 'a' + 10; printusage (), exit (BAD_OPTIONS); } -void settiestr(char *s) { - int i, j, c; +static void settiestr(char *s) { + int i, j; i = strlen(s); if ((i > 2*MAXLEN) || i%2 == 1) printusage (), exit (BAD_OPTIONS); tiestrlen = i/2; -- cgit v1.2.3