--------------------- PatchSet 3027 Date: 2001/09/13 19:45:54 Author: serassio Branch: nt-2_3-tolsty Tag: (none) Log: Fixed indent problems Members: src/authenticate.c:1.1.1.3.4.1.2.3.2.1->1.1.1.3.4.1.2.3.2.2 Index: squid/src/authenticate.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/authenticate.c,v retrieving revision 1.1.1.3.4.1.2.3.2.1 retrieving revision 1.1.1.3.4.1.2.3.2.2 diff -u -r1.1.1.3.4.1.2.3.2.1 -r1.1.1.3.4.1.2.3.2.2 --- squid/src/authenticate.c 27 Aug 2001 21:48:19 -0000 1.1.1.3.4.1.2.3.2.1 +++ squid/src/authenticate.c 13 Sep 2001 19:45:54 -0000 1.1.1.3.4.1.2.3.2.2 @@ -1,5 +1,5 @@ /* - * $Id: authenticate.c,v 1.1.1.3.4.1.2.3.2.1 2001/08/27 21:48:19 tolsty Exp $ + * $Id: authenticate.c,v 1.1.1.3.4.1.2.3.2.2 2001/09/13 19:45:54 serassio Exp $ * * DEBUG: section 29 Authenticator * AUTHOR: Duane Wessels @@ -34,13 +34,11 @@ #include "squid.h" -typedef struct -{ +typedef struct { void *data; acl_proxy_auth_user *auth_user; RH *handler; -} -authenticateStateData; +} authenticateStateData; static HLPCB authenticateHandleReply; static void authenticateStateFree(authenticateStateData * r); @@ -48,21 +46,17 @@ typedef int (*PFAuthenticate) (char *, char *, authenticateStateData *, HLPCB); typedef int (*PFInit) (char *); -typedef struct -{ +typedef struct { HINSTANCE hnd; PFAuthenticate Authenticate; PFInit Init; - struct - { + struct { int requests; int replies; int queue_size; int avg_svc_time; - } - stats; -} -AuthPlugin; + } stats; +} AuthPlugin; static AuthPlugin *authenticators = NULL; #else @@ -135,8 +129,7 @@ r->auth_user = auth_user; #ifdef _SQUID_MSW /*IN_ */ authenticators->stats.requests++; - authenticators->Authenticate(r->auth_user->user, r->auth_user->passwd, r, - authenticateHandleReply); + authenticators->Authenticate(r->auth_user->user, r->auth_user->passwd, r, authenticateHandleReply); authenticators->stats.replies++; #else snprintf(buf, 8192, "%s %s\n", r->auth_user->user, r->auth_user->passwd); @@ -153,21 +146,17 @@ #ifdef _SQUID_MSW /*IN_ */ if (authenticators == NULL) authenticators = xmalloc(sizeof(AuthPlugin)); - debug(29, 0) ("authenticateInit: Loading %s\n", - Config.Program.authenticate->key); + debug(29, 0) ("authenticateInit: Loading %s\n", Config.Program.authenticate->key); authenticators->hnd = LoadLibrary(Config.Program.authenticate->key); if (authenticators->hnd == NULL) { - debug(29, 0) ("authenticateInit: Unable to load %s\n", - Config.Program.authenticate->key); + debug(29, 0) ("authenticateInit: Unable to load %s\n", Config.Program.authenticate->key); xfree(authenticators); Config.Program.authenticate = NULL; return; } - authenticators->Authenticate = - (PFAuthenticate) GetProcAddress(authenticators->hnd, "Authenticate"); + authenticators->Authenticate = (PFAuthenticate) GetProcAddress(authenticators->hnd, "Authenticate"); if (authenticators->Authenticate == NULL) { - debug(29, 0) ("authenticateInit: Invalid auth plugin %s\n", - Config.Program.authenticate->key); + debug(29, 0) ("authenticateInit: Invalid auth plugin %s\n", Config.Program.authenticate->key); FreeLibrary(authenticators->hnd); xfree(authenticators); Config.Program.authenticate = NULL; @@ -175,20 +164,18 @@ } authenticators->Init = (PFInit) GetProcAddress(authenticators->hnd, "Init"); if (authenticators->Init == NULL) { - debug(29, 0) ("authenticateInit: Invalid auth plugin %s\n", - Config.Program.authenticate->key); + debug(29, 0) ("authenticateInit: Invalid auth plugin %s\n", Config.Program.authenticate->key); FreeLibrary(authenticators->hnd); xfree(authenticators); Config.Program.authenticate = NULL; return; } if (Config.Program.authenticate->next) { - debug(29, 0) ("authenticateInit: Initializing with group %s\n", - Config.Program.authenticate->next->key); + debug(29, 0) ("authenticateInit: Initializing with group %s\n", Config.Program.authenticate->next->key); authenticators->Init(Config.Program.authenticate->next->key); - } else { - debug(29, 0) ("authenticateInit: Missing auth plugin %s Parameter\n", - Config.Program.authenticate->key); + } + else { + debug(29, 0) ("authenticateInit: Missing auth plugin %s Parameter\n", Config.Program.authenticate->key); FreeLibrary(authenticators->hnd); xfree(authenticators); Config.Program.authenticate = NULL; @@ -206,7 +193,8 @@ #endif if (!init) { cachemgrRegister("authenticator", - "User Authenticator Stats", authenticateStats, 0, 1); + "User Authenticator Stats", + authenticateStats, 0, 1); init++; } }