diff options
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/main.h | 1 | ||||
| -rw-r--r-- | g10/misc.c | 25 |
3 files changed, 4 insertions, 26 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 41a736f58..07a0a1bae 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2004-02-21 David Shaw <[email protected]> + + * main.h, misc.c (hextobyte): Removed. It's in libutil.a now. + 2004-02-20 David Shaw <[email protected]> * keyserver.c (keyserver_export): Disallow user strings that diff --git a/g10/main.h b/g10/main.h index 8476bd641..bbc971970 100644 --- a/g10/main.h +++ b/g10/main.h @@ -91,7 +91,6 @@ struct expando_args }; char *pct_expando(const char *string,struct expando_args *args); -int hextobyte( const char *s ); void deprecated_warning(const char *configname,unsigned int configlineno, const char *option,const char *repl1,const char *repl2); const char *compress_algo_to_string(int algo); diff --git a/g10/misc.c b/g10/misc.c index 500abaaa4..e8bce52f5 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -476,31 +476,6 @@ pct_expando(const char *string,struct expando_args *args) return NULL; } -int -hextobyte( const char *s ) -{ - int c; - - if( *s >= '0' && *s <= '9' ) - c = 16 * (*s - '0'); - else if( *s >= 'A' && *s <= 'F' ) - c = 16 * (10 + *s - 'A'); - else if( *s >= 'a' && *s <= 'f' ) - c = 16 * (10 + *s - 'a'); - else - return -1; - s++; - if( *s >= '0' && *s <= '9' ) - c += *s - '0'; - else if( *s >= 'A' && *s <= 'F' ) - c += 10 + *s - 'A'; - else if( *s >= 'a' && *s <= 'f' ) - c += 10 + *s - 'a'; - else - return -1; - return c; -} - void deprecated_warning(const char *configname,unsigned int configlineno, const char *option,const char *repl1,const char *repl2) |