Commit 9deebfc8 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

AuRead.c: whitespace cleanup

parent a7355c5c
...@@ -68,16 +68,16 @@ static int ...@@ -68,16 +68,16 @@ static int
read_counted_string (unsigned short *countp, char **stringp, FILE *file) read_counted_string (unsigned short *countp, char **stringp, FILE *file)
{ {
unsigned short len; unsigned short len;
char *data; char *data;
if (read_short (&len, file) == 0) if (read_short (&len, file) == 0)
return 0; return 0;
if (len == 0) { if (len == 0) {
data = 0; data = 0;
} else { } else {
data = malloc ((unsigned) len); data = malloc ((unsigned) len);
if (!data) if (!data)
return 0; return 0;
#ifdef NX_TRANS_SOCKET #ifdef NX_TRANS_SOCKET
for (;;) for (;;)
{ {
...@@ -89,10 +89,10 @@ read_counted_string (unsigned short *countp, char **stringp, FILE *file) ...@@ -89,10 +89,10 @@ read_counted_string (unsigned short *countp, char **stringp, FILE *file)
clearerr (file); clearerr (file);
continue; continue;
} }
bzero (data, len); bzero (data, len);
free (data); free (data);
return 0; return 0;
} }
break; break;
} }
#else #else
...@@ -110,40 +110,40 @@ read_counted_string (unsigned short *countp, char **stringp, FILE *file) ...@@ -110,40 +110,40 @@ read_counted_string (unsigned short *countp, char **stringp, FILE *file)
Xauth * Xauth *
XauReadAuth (auth_file) XauReadAuth (auth_file)
FILE *auth_file; FILE *auth_file;
{ {
Xauth local; Xauth local;
Xauth *ret; Xauth *ret;
if (read_short (&local.family, auth_file) == 0) if (read_short (&local.family, auth_file) == 0)
return 0; return 0;
if (read_counted_string (&local.address_length, &local.address, auth_file) == 0) if (read_counted_string (&local.address_length, &local.address, auth_file) == 0)
return 0; return 0;
if (read_counted_string (&local.number_length, &local.number, auth_file) == 0) { if (read_counted_string (&local.number_length, &local.number, auth_file) == 0) {
if (local.address) free (local.address); if (local.address) free (local.address);
return 0; return 0;
} }
if (read_counted_string (&local.name_length, &local.name, auth_file) == 0) { if (read_counted_string (&local.name_length, &local.name, auth_file) == 0) {
if (local.address) free (local.address); if (local.address) free (local.address);
if (local.number) free (local.number); if (local.number) free (local.number);
return 0; return 0;
} }
if (read_counted_string (&local.data_length, &local.data, auth_file) == 0) { if (read_counted_string (&local.data_length, &local.data, auth_file) == 0) {
if (local.address) free (local.address); if (local.address) free (local.address);
if (local.number) free (local.number); if (local.number) free (local.number);
if (local.name) free (local.name); if (local.name) free (local.name);
return 0; return 0;
} }
ret = (Xauth *) malloc (sizeof (Xauth)); ret = (Xauth *) malloc (sizeof (Xauth));
if (!ret) { if (!ret) {
if (local.address) free (local.address); if (local.address) free (local.address);
if (local.number) free (local.number); if (local.number) free (local.number);
if (local.name) free (local.name); if (local.name) free (local.name);
if (local.data) { if (local.data) {
bzero (local.data, local.data_length); bzero (local.data, local.data_length);
free (local.data); free (local.data);
} }
return 0; return 0;
} }
*ret = local; *ret = local;
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment