From b16ccf18fcf49e48bd2369a6ebea0936953c0b67 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 18 Oct 2011 04:41:13 +0000
Subject: [PATCH] svn path=/trunk/boinc/; revision=24411

---
 client/cs_notice.cpp |  2 +-
 client/http_curl.cpp | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/cs_notice.cpp b/client/cs_notice.cpp
index 573ec98a4e..c7572d6627 100644
--- a/client/cs_notice.cpp
+++ b/client/cs_notice.cpp
@@ -72,7 +72,7 @@ int parse_rss_feed_descs(XML_PARSER& xp, vector<RSS_FEED>& feeds) {
                 if (log_flags.sched_op_debug) {
                     msg_printf(0, MSG_INFO,
                         "[sched_op] error in <rss_feed> element"
-                     );
+                    );
                 }
             } else {
                 feeds.push_back(rf);
diff --git a/client/http_curl.cpp b/client/http_curl.cpp
index d061bda437..2fe5b71942 100644
--- a/client/http_curl.cpp
+++ b/client/http_curl.cpp
@@ -188,7 +188,7 @@ void libcurl_logdebug(
     p = strtok(buf, "\n");
     while(p) {
         if (log_flags.http_debug) {
-            msg_printf(0, MSG_INFO,
+            msg_printf(phop->project, MSG_INFO,
                 "[http] %s %s\n", hdr, p
             );
         }
@@ -289,7 +289,7 @@ int HTTP_OP::init_get(
     http_op_type = HTTP_OP_GET;
     http_op_state = HTTP_STATE_CONNECTING;
     if (log_flags.http_debug) {
-        msg_printf(0, MSG_INFO, "[http] HTTP_OP::init_get(): %s", url);
+        msg_printf(project, MSG_INFO, "[http] HTTP_OP::init_get(): %s", url);
     }
     return HTTP_OP::libcurl_exec(url, NULL, out, off, false);
 }
@@ -317,7 +317,7 @@ int HTTP_OP::init_post(
     http_op_type = HTTP_OP_POST;
     http_op_state = HTTP_STATE_CONNECTING;
     if (log_flags.http_debug) {
-        msg_printf(0, MSG_INFO, "[http] HTTP_OP::init_post(): %s", url);
+        msg_printf(project, MSG_INFO, "[http] HTTP_OP::init_post(): %s", url);
     }
     return HTTP_OP::libcurl_exec(url, in, out, 0.0, true);
 }
@@ -417,7 +417,7 @@ int HTTP_OP::libcurl_exec(
     curlEasy = curl_easy_init(); // get a curl_easy handle to use
     if (!curlEasy) {
         if (log_flags.http_debug) {
-            msg_printf(0, MSG_INFO, "Couldn't create curlEasy handle");
+            msg_printf(project, MSG_INFO, "Couldn't create curlEasy handle");
         }
         return ERR_HTTP_ERROR; // returns 0 (CURLM_OK) on successful handle creation
     }
@@ -483,7 +483,7 @@ int HTTP_OP::libcurl_exec(
 
             if (log_flags.http_debug) {
                 msg_printf(
-                    0,
+                    project,
                     MSG_INFO,
                     "[http] HTTP_OP::libcurl_exec(): ca-bundle '%s'",
                     m_curl_ca_bundle_location
@@ -498,7 +498,7 @@ int HTTP_OP::libcurl_exec(
         curl_easy_setopt(curlEasy, CURLOPT_CAINFO, m_curl_ca_bundle_location);
         if (log_flags.http_debug) {
             msg_printf(
-                0,
+                project,
                 MSG_INFO,
                 "[http] HTTP_OP::libcurl_exec(): ca-bundle set"
             );
@@ -1003,7 +1003,7 @@ void HTTP_OP::handle_messages(CURLMsg *pcurlMsg) {
             net_status.got_http_error();
         }
         if (log_flags.http_debug) {
-            msg_printf(NULL, MSG_INFO,
+            msg_printf(project, MSG_INFO,
                 "[http] HTTP error: %s", error_msg
             );
         }
@@ -1030,7 +1030,7 @@ void HTTP_OP::handle_messages(CURLMsg *pcurlMsg) {
             size_t nread = fread(req1, 1, dSize, fileOut);
             if (nread != dSize) {
                 if (log_flags.http_debug) {
-                    msg_printf(NULL, MSG_INFO,
+                    msg_printf(project, MSG_INFO,
                         "[http] post output file read failed %d",
                         (int)nread
                     );
@@ -1116,7 +1116,7 @@ void HTTP_OP::set_speed_limit(bool is_upload, double bytes_sec) {
         cc = curl_easy_setopt(curlEasy, CURLOPT_MAX_RECV_SPEED_LARGE, bs);
     }
     if (cc && log_flags.http_debug) {
-        msg_printf(NULL, MSG_INFO,
+        msg_printf(project, MSG_INFO,
             "[http] Curl error in set_speed_limit(): %s",
             curl_easy_strerror(cc)
         );