From e18414ad0b88147bc8218870a2dd58a68af5a160 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 29 Apr 2008 17:23:33 +0000 Subject: [PATCH] tweak the last commit: when parsing peer-ids we don't want locales to postentially change the behavior of isalpha/isdigit/etc --- libtransmission/clients.c | 6 +++--- libtransmission/tracker.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libtransmission/clients.c b/libtransmission/clients.c index a5891aaec..bb6c154e8 100644 --- a/libtransmission/clients.c +++ b/libtransmission/clients.c @@ -36,9 +36,9 @@ static int charint( char ch ) { - if( isdigit( ch ) ) return ch - '0'; - if( isupper( ch ) ) return 10 + ch - 'A'; - if( islower( ch ) ) return 36 + ch - 'a'; + if( '0' <= ch && ch <= '9' ) return ch - '0'; + if( 'A' <= ch && ch <= 'Z' ) return 10 + ch - 'A'; + if( 'a' <= ch && ch <= 'z' ) return 36 + ch - 'a'; return 0; } diff --git a/libtransmission/tracker.c b/libtransmission/tracker.c index c49032ec6..aa925f295 100644 --- a/libtransmission/tracker.c +++ b/libtransmission/tracker.c @@ -841,9 +841,9 @@ generateKeyParam( char * msg, int len ) static int is_rfc2396_alnum( char ch ) { - return ( (ch >= 'a' && ch <= 'z' ) - || (ch >= 'A' && ch <= 'Z' ) - || (ch >= '0' && ch <= '9' ) ); + return ( '0' <= ch && ch <= '9' ) + || ( 'A' <= ch && ch <= 'Z' ) + || ( 'a' <= ch && ch <= 'z' ); } static void