Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 4349 invoked from network); 5 Aug 2006 00:56:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Aug 2006 00:56:39 -0000 Received: (qmail 3415 invoked by uid 500); 5 Aug 2006 00:56:38 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 3377 invoked by uid 500); 5 Aug 2006 00:56:38 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 3366 invoked by uid 99); 5 Aug 2006 00:56:38 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2006 17:56:38 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2006 17:56:38 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0592A1A981A; Fri, 4 Aug 2006 17:56:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r428934 - /apr/apr-util/trunk/memcache/apr_memcache.c Date: Sat, 05 Aug 2006 00:56:17 -0000 To: commits@apr.apache.org From: pquerna@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060805005618.0592A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pquerna Date: Fri Aug 4 17:56:17 2006 New Revision: 428934 URL: http://svn.apache.org/viewvc?rev=428934&view=rev Log: Replace C++ style comments. No functional changes. Modified: apr/apr-util/trunk/memcache/apr_memcache.c Modified: apr/apr-util/trunk/memcache/apr_memcache.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/memcache/apr_memcache.c?rev=428934&r1=428933&r2=428934&view=diff ============================================================================== --- apr/apr-util/trunk/memcache/apr_memcache.c (original) +++ apr/apr-util/trunk/memcache/apr_memcache.c Fri Aug 4 17:56:17 2006 @@ -1042,12 +1042,12 @@ apr_memcache_value_t* value; int klen = strlen(key); - // create the value hash if need be + /* create the value hash if need be */ if (!*values) { *values = apr_hash_make(data_pool); } - // init key and add it to the value hash + /* init key and add it to the value hash */ value = apr_pcalloc(data_pool, sizeof(apr_memcache_value_t)); value->status = APR_NOTFOUND; @@ -1122,7 +1122,7 @@ apr_pollfd_t* pollfds; - // build all the queries + /* build all the queries */ value_hash_index = apr_hash_first(temp_pool, values); while (value_hash_index) { apr_hash_this(value_hash_index, NULL, NULL, (void**)&value); @@ -1154,7 +1154,7 @@ server_query->conn = conn; server_query->query_vec = apr_pcalloc(temp_pool, sizeof(struct iovec)*veclen); - // set up the first key + /* set up the first key */ server_query->query_vec[0].iov_base = MC_GET; server_query->query_vec[0].iov_len = MC_GET_LEN; @@ -1185,7 +1185,7 @@ } } - // create polling structures + /* create polling structures */ pollfds = apr_pcalloc(temp_pool, apr_hash_count(server_queries) * sizeof(apr_pollfd_t)); rv = apr_pollset_create(&pollset, apr_hash_count(server_queries), temp_pool, 0); @@ -1194,7 +1194,7 @@ return rv; } - // send all the queries + /* send all the queries */ queries_sent = 0; query_hash_index = apr_hash_first(temp_pool, server_queries); @@ -1230,7 +1230,7 @@ rv = apr_pollset_poll(pollset, MULT_GET_TIMEOUT, &queries_recvd, &activefds); if (rv != APR_SUCCESS) { - // timeout + /* timeout */ queries_sent = 0; continue; } @@ -1259,7 +1259,7 @@ apr_size_t len; start = conn->buffer; - key = apr_strtok(conn->buffer, " ", &last); // just the VALUE, ignore + key = apr_strtok(conn->buffer, " ", &last); /* just the VALUE, ignore */ key = apr_strtok(NULL, " ", &last); flags = apr_strtok(NULL, " ", &last); @@ -1317,16 +1317,17 @@ value->status = rv; value->flags = atoi(flags); - // stay on the server + /* stay on the server */ i--; } else { - // TODO: Server Sent back a key I didn't ask for or my hash is corrupt + /* TODO: Server Sent back a key I didn't ask for or my + * hash is corrupt */ } } else if (strncmp(MS_END, conn->buffer, MS_END_LEN) == 0) { - // this connection is done + /* this connection is done */ ms_release_conn(ms, conn); apr_hash_set(server_queries, &ms, sizeof(ms), NULL);