security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

gcc-4 defaults forced me to edit many many files to get rid of the

Browse source 
char * vs. unsigned char * warnings.  The GNU coding standards used to
say that these mismatches are okay and better than a bunch of casts.
Obviously this has changed now.
This commit is contained in:
Werner Koch 2005-06-16 08:12:03 +00:00
parent 3370164182
commit deeba405a9
69 changed files with 558 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

21
jnlib/utf8conv.c
View file

@ -136,16 +136,17 @@ get_native_charset ()
* new allocated UTF8 string.
*/
char *
native_to_utf8 (const char *string)
native_to_utf8 (const char *orig_string)
{
const byte *s;
const unsigned char *string = (const unsigned char *)orig_string;
const unsigned char *s;
char *buffer;
byte *p;
unsigned char *p;
size_t length = 0;
if (no_translation)
{
buffer = jnlib_xstrdup (string);
buffer = jnlib_xstrdup (orig_string);
}
else if (active_charset)
{
@ -156,7 +157,7 @@ native_to_utf8 (const char *string)
length += 2; /* we may need 3 bytes */
}
buffer = jnlib_xmalloc (length + 1);
for (p = buffer, s = string; *s; s++)
for (p = (unsigned char *)buffer, s = string; *s; s++)
{
if ((*s & 0x80))
{
@ -187,7 +188,7 @@ native_to_utf8 (const char *string)
length++;
}
buffer = jnlib_xmalloc (length + 1);
for (p = buffer, s = string; *s; s++)
for (p = (unsigned char *)buffer, s = string; *s; s++)
{
if (*s & 0x80)
{
@ -212,11 +213,12 @@ utf8_to_native (const char *string, size_t length, int delim)
{
int nleft;
int i;
byte encbuf[8];
unsigned char encbuf[8];
int encidx;
const byte *s;
size_t n;
byte *buffer = NULL, *p = NULL;
char *buffer = NULL;
char *p = NULL;
unsigned long val = 0;
size_t slen;
int resync = 0;
@ -225,7 +227,8 @@ utf8_to_native (const char *string, size_t length, int delim)
/* 2. pass (p!=NULL): create string */
for (;;)
{
for (slen = length, nleft = encidx = 0, n = 0, s = string; slen;
for (slen = length, nleft = encidx = 0, n = 0,
s = (const unsigned char *)string; slen;
s++, slen--)
{
if (resync)