mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-17 15:44:34 +02:00
* main.h, misc.c (hextobyte): Removed. It's in libutil.a now.
This commit is contained in:
parent
34ccced8dc
commit
93b5a811ef
@ -1,3 +1,7 @@
|
|||||||
|
2004-02-21 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* main.h, misc.c (hextobyte): Removed. It's in libutil.a now.
|
||||||
|
|
||||||
2004-02-20 David Shaw <dshaw@jabberwocky.com>
|
2004-02-20 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
* keyserver.c (keyserver_export): Disallow user strings that
|
* keyserver.c (keyserver_export): Disallow user strings that
|
||||||
|
@ -91,7 +91,6 @@ struct expando_args
|
|||||||
};
|
};
|
||||||
|
|
||||||
char *pct_expando(const char *string,struct expando_args *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,
|
void deprecated_warning(const char *configname,unsigned int configlineno,
|
||||||
const char *option,const char *repl1,const char *repl2);
|
const char *option,const char *repl1,const char *repl2);
|
||||||
const char *compress_algo_to_string(int algo);
|
const char *compress_algo_to_string(int algo);
|
||||||
|
25
g10/misc.c
25
g10/misc.c
@ -476,31 +476,6 @@ pct_expando(const char *string,struct expando_args *args)
|
|||||||
return NULL;
|
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
|
void
|
||||||
deprecated_warning(const char *configname,unsigned int configlineno,
|
deprecated_warning(const char *configname,unsigned int configlineno,
|
||||||
const char *option,const char *repl1,const char *repl2)
|
const char *option,const char *repl1,const char *repl2)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user