A few more style-fixes from Bruce.  The only non-cosmetic change is to drop a call to setuid() which has not been needed for years.
A few more style-fixes from Bruce.  The only non-cosmetic change
is to drop a call to setuid() which has not been needed for years.

Noticed by:	bde

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase