* Changed some instances of 'struct CitContext *CCC = CC;' to 'struct CitContext...

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 29f5e62365774a1d8793b5bd1ebdefa12f8b7606..7220709ba449af9f3ab1c95734b2b1a26035e8b8 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -152,7 +152,7 @@ int socket_read_blob(int *Socket,
                     int bytes, 
                     int timeout)
 {
-       CitContext *CCC=CC;
+       CitContext *CCC = MyContext();
        const char *Error;
        int retval = 0;
 
@@ -177,7 +177,7 @@ int socket_read_blob(int *Socket,
 
 int sock_read_to(int *sock, char *buf, int bytes, int timeout, int keep_reading_until_full)
 {
-       CitContext *CCC=CC;
+       CitContext *CCC = MyContext();
        int rc;
 
        FlushStrBuf(CCC->MigrateBuf);
@@ -206,7 +206,7 @@ int sock_read_to(int *sock, char *buf, int bytes, int timeout, int keep_reading_
 
 int CtdlSockGetLine(int *sock, StrBuf *Target)
 {
-       CitContext *CCC=CC;
+       CitContext *CCC = MyContext();
        const char *Error;
        int rc;
 
@@ -235,7 +235,7 @@ int CtdlSockGetLine(int *sock, StrBuf *Target)
 int sock_getln(int *sock, char *buf, int bufsize)
 {
        int i, retval;
-       CitContext *CCC=CC;
+       CitContext *CCC = MyContext();
        const char *pCh;
 
        FlushStrBuf(CCC->sMigrateBuf);

diff --git a/citadel/context.c b/citadel/context.c
index 06615b7e2c3db38887e97a02a882287020beae04..fb4a5dd11f9a68537204b958c5e7362a7b1aa750 100644 (file)
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -461,7 +461,7 @@ void CtdlFillSystemContext(CitContext *context, char *name)
  */
 void CtdlClearSystemContext(void)
 {
-       CitContext *CCC = CC;
+       CitContext *CCC = MyContext();
 
        memset(CCC, 0, sizeof(CitContext));
        citthread_setspecific(MyConKey, NULL);

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index fc81c03bdac3c7eff96328ed1f1636fc4bd67782..f1aa9da9234e40e4be441a89dfa3132efd1dfd09 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -2857,7 +2857,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        struct addresses_to_be_filed *aptr = NULL;
        StrBuf *saved_rfc822_version = NULL;
        int qualified_for_journaling = 0;
-       CitContext *CCC = CC;           /* CachedCitContext - performance boost */
+       CitContext *CCC = MyContext();
        char bounce_to[1024] = "";
        size_t tmp = 0;
        int rv = 0;

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 9dce3a3ae0a94c973a897e31407417fcdb1a8c53..7da7aa547c9727133d1be8871238f346c8f5d76e 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -120,7 +120,7 @@ void vCtdlLogPrintf(enum LogLevel loglevel, const char *format, va_list arg_ptr)
                struct timeval tv;
                struct tm tim;
                time_t unixtime;
-               CitContext *CCC = CC;
+               CitContext *CCC = MyContext();
                ThreadTSD *cTSD = CTP;
                CtdlThreadNode *node = NULL;
                long lwpid = 0;

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 95ec1e207a9ec8818e9f233ea13da7ee8981ce6b..6e15afb8f9f3cae5a849c535e441a974ce661dd4 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -774,7 +774,7 @@ void logout(void)
 
 void CtdlUserLogout(void)
 {
-       CitContext *CCC = CC;   /* CachedCitContext - performance boost */
+       CitContext *CCC = MyContext();
        /*
         * If there is a download in progress, abort it.
         */