From: Francesco Chemolli Date: Tue, 10 Jul 2012 15:44:23 +0000 (+0200) Subject: Changed increment/decrement operators from postfix to prefix form. X-Git-Tag: sourceformat-review-1~164^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2f5277a47bddc7f48a1109a8ac18a21d6a711de;p=thirdparty%2Fsquid.git Changed increment/decrement operators from postfix to prefix form. --- diff --git a/helpers/basic_auth/NCSA/crypt_md5.cc b/helpers/basic_auth/NCSA/crypt_md5.cc index 6874e9a05b..6b616d0b1b 100644 --- a/helpers/basic_auth/NCSA/crypt_md5.cc +++ b/helpers/basic_auth/NCSA/crypt_md5.cc @@ -59,7 +59,8 @@ char *crypt_md5(const char *pw, const char *salt) unsigned long l; if (*salt == '$') { - magic = salt++; + magic = salt; + ++salt; while (*salt && *salt != '$') ++salt; if (*salt == '$') { diff --git a/helpers/external_acl/LM_group/ext_lm_group_acl.cc b/helpers/external_acl/LM_group/ext_lm_group_acl.cc index a93390917e..2e372c52ce 100644 --- a/helpers/external_acl/LM_group/ext_lm_group_acl.cc +++ b/helpers/external_acl/LM_group/ext_lm_group_acl.cc @@ -285,7 +285,7 @@ Valid_Local_Groups(char *UserName, const char **Groups) */ if (nStatus == NERR_Success) { if ((pTmpBuf = pBuf) != NULL) { - for (i = 0; i < dwEntriesRead; i++) { + for (i = 0; i < dwEntriesRead; ++i) { assert(pTmpBuf != NULL); if (pTmpBuf == NULL) { result = 0; @@ -341,7 +341,7 @@ Valid_Global_Groups(char *UserName, const char **Groups) strncpy(NTDomain, UserName, sizeof(NTDomain)); - for (j = 0; j < strlen(NTV_VALID_DOMAIN_SEPARATOR); j++) { + for (j = 0; j < strlen(NTV_VALID_DOMAIN_SEPARATOR); ++j) { if ((domain_qualify = strchr(NTDomain, NTV_VALID_DOMAIN_SEPARATOR[j])) != NULL) break; } @@ -422,7 +422,7 @@ Valid_Global_Groups(char *UserName, const char **Groups) */ if (nStatus == NERR_Success) { if ((pTmpBuf = pUsrBuf) != NULL) { - for (i = 0; i < dwEntriesRead; i++) { + for (i = 0; i < dwEntriesRead; ++i) { assert(pTmpBuf != NULL); if (pTmpBuf == NULL) { result = 0; @@ -579,7 +579,7 @@ main(int argc, char *argv[]) continue; } username = strtok(buf, " "); - for (n = 0; (group = strtok(NULL, " ")) != NULL; n++) { + for (n = 0; (group = strtok(NULL, " ")) != NULL; ++n) { rfc1738_unescape(group); groups[n] = group; } diff --git a/helpers/external_acl/kerberos_ldap_group/support_group.cc b/helpers/external_acl/kerberos_ldap_group/support_group.cc index 4b3abae847..5f528c2ec7 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_group.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_group.cc @@ -55,13 +55,13 @@ utf8dup(struct main_args *margs) src = margs->glist; if (!src) return NULL; - for (n = 0; n < strlen(src); n++) + for (n = 0; n < strlen(src); ++n) if ((unsigned char) src[n] > 127) ++c; if (c != 0) { p = (unsigned char *) xmalloc(strlen(src) + c); dupp = p; - for (n = 0; n < strlen(src); n++) { + for (n = 0; n < strlen(src); ++n) { s = (unsigned char) src[n]; if (s > 127 && s < 192) { *p = 194; diff --git a/helpers/external_acl/kerberos_ldap_group/support_krb5.cc b/helpers/external_acl/kerberos_ldap_group/support_krb5.cc index 44a6b95aac..b4dfc98ff7 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_krb5.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_krb5.cc @@ -187,7 +187,7 @@ krb5_create_cache(struct main_args *margs, char *domain) creds = (krb5_creds *) xmalloc(sizeof(*creds)); memset(creds, 0, sizeof(*creds)); - for (i = 0; i < nprinc; i++) { + for (i = 0; i < nprinc; ++i) { /* * get credentials */ @@ -324,7 +324,7 @@ cleanup: xfree(mem_cache); if (principal) krb5_free_principal(kparam.context, principal); - for (i = 0; i < nprinc; i++) { + for (i = 0; i < nprinc; ++i) { if (principal_list[i]) krb5_free_principal(kparam.context, principal_list[i]); } diff --git a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc index e0b83b024e..9c79276cec 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc @@ -227,7 +227,7 @@ convert_domain_to_bind_path(char *domain) if (!domain) return NULL; - for (dp = domain; *dp; dp++) { + for (dp = domain; *dp; ++dp) { if (*dp == '.') ++i; } @@ -239,7 +239,7 @@ convert_domain_to_bind_path(char *domain) bp = bindp; strcpy(bp, "dc="); bp += 3; - for (dp = domain; *dp; dp++) { + for (dp = domain; *dp; ++dp) { if (*dp == '.') { strcpy(bp, ",dc="); bp += 4; @@ -257,7 +257,7 @@ escape_filter(char *filter) char *ldap_filter_esc, *ldf; i = 0; - for (ldap_filter_esc = filter; *ldap_filter_esc; ldap_filter_esc++) { + for (ldap_filter_esc = filter; *ldap_filter_esc; ++ldap_filter_esc) { if ((*ldap_filter_esc == '*') || (*ldap_filter_esc == '(') || (*ldap_filter_esc == ')') || @@ -267,7 +267,7 @@ escape_filter(char *filter) ldap_filter_esc = (char *) xcalloc(strlen(filter) + i + 1, sizeof(char)); ldf = ldap_filter_esc; - for (; *filter; filter++) { + for (; *filter; ++filter) { if (*filter == '*') { strcpy(ldf, "\\2a"); ldf = ldf + 3; @@ -328,7 +328,7 @@ check_AD(struct main_args *margs, LDAP * ld) * Cleanup */ if (attr_value) { - for (j = 0; j < max_attr; j++) { + for (j = 0; j < max_attr; ++j) { xfree(attr_value[j]); } xfree(attr_value); @@ -398,7 +398,7 @@ search_group_tree(struct main_args *margs, LDAP * ld, char *bindp, char *ldap_gr */ retval = 0; ldepth = depth + 1; - for (j = 0; j < max_attr; j++) { + for (j = 0; j < max_attr; ++j) { /* Compare first CN= value assuming it is the same as the group name itself */ av = attr_value[j]; @@ -411,7 +411,7 @@ search_group_tree(struct main_args *margs, LDAP * ld, char *bindp, char *ldap_gr if (debug_enabled) { int n; debug((char *) "%s| %s: DEBUG: Entry %d \"%s\" in hex UTF-8 is ", LogTime(), PROGRAM, j + 1, av); - for (n = 0; av[n] != '\0'; n++) + for (n = 0; av[n] != '\0'; ++n) fprintf(stderr, "%02x", (unsigned char) av[n]); fprintf(stderr, "\n"); } @@ -446,7 +446,7 @@ search_group_tree(struct main_args *margs, LDAP * ld, char *bindp, char *ldap_gr * Cleanup */ if (attr_value) { - for (j = 0; j < max_attr; j++) { + for (j = 0; j < max_attr; ++j) { xfree(attr_value[j]); } xfree(attr_value); @@ -597,7 +597,7 @@ get_attributes(struct main_args *margs, LDAP * ld, LDAPMessage * res, const char int il; if ((values = ldap_get_values_len(ld, msg, attr)) != NULL) { - for (il = 0; values[il] != NULL; il++) { + for (il = 0; values[il] != NULL; ++il) { attr_value = (char **) xrealloc(attr_value, (il + 1) * sizeof(char *)); if (!attr_value) @@ -871,7 +871,7 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group) * Loop over list of ldap servers of users domain */ nhosts = get_ldap_hostname_list(margs, &hlist, 0, domain); - for (i = 0; i < nhosts; i++) { + for (i = 0; i < nhosts; ++i) { port = 389; if (hlist[i].port != -1) port = hlist[i].port; @@ -940,7 +940,7 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group) if (host) xfree(host); host = NULL; - for (i = 0; i < nhosts; i++) { + for (i = 0; i < nhosts; ++i) { ld = tool_ldap_open(margs, hlist[i].host, port, ssl); if (!ld) @@ -1035,7 +1035,7 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group) * Compare group names */ retval = 0; - for (j = 0; j < max_attr; j++) { + for (j = 0; j < max_attr; ++j) { /* Compare first CN= value assuming it is the same as the group name itself */ av = attr_value[j]; @@ -1048,7 +1048,7 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group) if (debug_enabled) { int n; debug((char *) "%s| %s: DEBUG: Entry %d \"%s\" in hex UTF-8 is ", LogTime(), PROGRAM, j + 1, av); - for (n = 0; av[n] != '\0'; n++) + for (n = 0; av[n] != '\0'; ++n) fprintf(stderr, "%02x", (unsigned char) av[n]); fprintf(stderr, "\n"); } @@ -1068,7 +1068,7 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group) if (debug_enabled && max_attr > 0) { debug((char *) "%s| %s: DEBUG: Perform recursive group search\n", LogTime(), PROGRAM); } - for (j = 0; j < max_attr; j++) { + for (j = 0; j < max_attr; ++j) { av = attr_value[j]; if (search_group_tree(margs, ld, bindp, av, group, 1)) { @@ -1090,7 +1090,7 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group) * Cleanup */ if (attr_value) { - for (j = 0; j < max_attr; j++) { + for (j = 0; j < max_attr; ++j) { xfree(attr_value[j]); } xfree(attr_value); @@ -1176,7 +1176,7 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group) * Cleanup */ if (attr_value_2) { - for (j = 0; j < max_attr_2; j++) { + for (j = 0; j < max_attr_2; ++j) { xfree(attr_value_2[j]); } xfree(attr_value_2); @@ -1192,7 +1192,7 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group) * Cleanup */ if (attr_value) { - for (j = 0; j < max_attr; j++) { + for (j = 0; j < max_attr; ++j) { xfree(attr_value[j]); } xfree(attr_value); diff --git a/helpers/external_acl/kerberos_ldap_group/support_resolv.cc b/helpers/external_acl/kerberos_ldap_group/support_resolv.cc index 1ad03dbfa1..42415c0b1e 100644 --- a/helpers/external_acl/kerberos_ldap_group/support_resolv.cc +++ b/helpers/external_acl/kerberos_ldap_group/support_resolv.cc @@ -152,7 +152,7 @@ free_hostname_list(struct hstruct **hlist, int nhosts) int i; hp = *hlist; - for (i = 0; i < nhosts; i++) { + for (i = 0; i < nhosts; ++i) { if (hp[i].host) xfree(hp[i].host); hp[i].host = NULL; diff --git a/helpers/external_acl/unix_group/check_group.cc b/helpers/external_acl/unix_group/check_group.cc index 3e36a0abed..9cf0150013 100644 --- a/helpers/external_acl/unix_group/check_group.cc +++ b/helpers/external_acl/unix_group/check_group.cc @@ -223,7 +223,7 @@ main(int argc, char *argv[]) } /* check groups supplied on the command line */ - for (i = 0; i < ngroups; i++) { + for (i = 0; i < ngroups; ++i) { if (check_pw == 1) { j += validate_user_pw(user, grents[i]); } diff --git a/lib/MemPoolChunked.cc b/lib/MemPoolChunked.cc index a8245a4512..ecabddea62 100644 --- a/lib/MemPoolChunked.cc +++ b/lib/MemPoolChunked.cc @@ -184,7 +184,7 @@ MemChunk::~MemChunk() { memMeterDel(pool->getMeter().alloc, pool->chunk_capacity); memMeterDel(pool->getMeter().idle, pool->chunk_capacity); - pool->chunkCount--; + -- pool->chunkCount; pool->allChunks.remove(this, memCompChunks); xfree(objCache); } @@ -230,7 +230,7 @@ MemPoolChunked::get() /* then try perchunk freelist chain */ if (nextFreeChunk == NULL) { /* no chunk with frees, so create new one */ - saved_calls--; // compensate for the ++ above + -- saved_calls; // compensate for the ++ above createChunk(); } /* now we have some in perchunk freelist chain */ @@ -371,7 +371,7 @@ MemPoolChunked::convertFreeCacheToChunkFreeCache() chunk = const_cast(*allChunks.find(Free, memCompObjChunks)); assert(splayLastResult == 0); assert(chunk->inuse_count > 0); - chunk->inuse_count--; + -- chunk->inuse_count; (void) VALGRIND_MAKE_MEM_DEFINED(Free, sizeof(void *)); freeCache = *(void **)Free; /* remove from global cache */ *(void **)Free = chunk->freeList; /* stuff into chunks freelist */ diff --git a/lib/hash.cc b/lib/hash.cc index c3c8ce029a..b3d3061d7d 100644 --- a/lib/hash.cc +++ b/lib/hash.cc @@ -121,7 +121,7 @@ hash4(const void *data, unsigned int size) case 1: HASH4; } - while (loop--) { + while (--loop) { HASH4; HASH4; HASH4; diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index 298143d2fb..79afc6b16e 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -209,7 +209,7 @@ int Adaptation::Icap::ServiceRep::excessConnections() const void Adaptation::Icap::ServiceRep::noteGoneWaiter() { - theAllWaiters--; + --theAllWaiters; // in case the notified transaction did not take the connection slot busyCheckpoint(); diff --git a/src/auth/User.cc b/src/auth/User.cc index 960fe56660..696d914054 100644 --- a/src/auth/User.cc +++ b/src/auth/User.cc @@ -111,7 +111,7 @@ Auth::User::absorb(Auth::User::Pointer from) dlinkDelete(&new_ipdata->node, &(from->ip_list)); cbdataFree(new_ipdata); /* catch incipient underflow */ - from->ipcount--; + -- from->ipcount; } else { /* add to our list. replace if already present. */ AuthUserIP *ipdata = static_cast(ip_list.head->data); @@ -131,7 +131,7 @@ Auth::User::absorb(Auth::User::Pointer from) cbdataFree(ipdata); /* catch incipient underflow */ assert(ipcount); - ipcount--; + -- ipcount; } ipdata = tempnode; @@ -257,7 +257,7 @@ Auth::User::clearIp() cbdataFree(ipdata); /* catch incipient underflow */ assert(ipcount); - ipcount--; + -- ipcount; ipdata = tempnode; } @@ -279,7 +279,7 @@ Auth::User::removeIp(Ip::Address ipaddr) cbdataFree(ipdata); /* catch incipient underflow */ assert(ipcount); - ipcount--; + -- ipcount; return; } @@ -316,7 +316,7 @@ Auth::User::addIp(Ip::Address ipaddr) cbdataFree(ipdata); /* catch incipient underflow */ assert(ipcount); - ipcount--; + -- ipcount; } ipdata = tempnode; diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc index 01895d9c95..58ad620ae0 100644 --- a/src/auth/digest/auth_digest.cc +++ b/src/auth/digest/auth_digest.cc @@ -320,7 +320,7 @@ authDigestNonceUnlink(digest_nonce_h * nonce) assert(nonce != NULL); if (nonce->references > 0) { - nonce->references--; + -- nonce->references; } else { debugs(29, 1, "authDigestNonceUnlink; Attempt to lower nonce " << nonce << " refcount below 0!"); } diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc index f4e23897f6..05489ba540 100644 --- a/src/auth/negotiate/UserRequest.cc +++ b/src/auth/negotiate/UserRequest.cc @@ -270,7 +270,7 @@ Auth::Negotiate::UserRequest::HandleReply(void *data, void *lastserver, char *re blob = strchr(reply, ' '); if (blob) { - blob++; + ++blob; arg = strchr(blob + 1, ' '); } else { arg = NULL; diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc index 556742e7ca..8c2a96a4c5 100644 --- a/src/comm/ConnOpener.cc +++ b/src/comm/ConnOpener.cc @@ -228,7 +228,7 @@ Comm::ConnOpener::connect() if (callback_ == NULL || callback_->canceled()) return; - totalTries_++; + ++ totalTries_; switch (comm_connect_addr(temporaryFd_, conn_->remote) ) { @@ -252,7 +252,7 @@ Comm::ConnOpener::connect() break; default: - failRetries_++; + ++failRetries_; // check for timeout FIRST. if (squid_curtime - connectStart_ > connectTimeout_) { diff --git a/src/comm/Connection.cc b/src/comm/Connection.cc index 20744d9eb1..222da0b6ec 100644 --- a/src/comm/Connection.cc +++ b/src/comm/Connection.cc @@ -61,8 +61,8 @@ Comm::Connection::close() if (isOpen()) { comm_close(fd); fd = -1; - if (getPeer()) - getPeer()->stats.conn_open--; + if (peer *p=getPeer()) + -- p->stats.conn_open; } } diff --git a/src/comm/ModSelectWin32.cc b/src/comm/ModSelectWin32.cc index b234b1a8db..f350c2fe66 100644 --- a/src/comm/ModSelectWin32.cc +++ b/src/comm/ModSelectWin32.cc @@ -217,7 +217,7 @@ comm_check_incoming_select_handlers(int nfds, int *fds) FD_ZERO(&write_mask); incoming_sockets_accepted = 0; - for (i = 0; i < nfds; i++) { + for (i = 0; i < nfds; ++i) { fd = fds[i]; if (fd_table[fd].read_handler) { @@ -240,13 +240,13 @@ comm_check_incoming_select_handlers(int nfds, int *fds) getCurrentTime(); - statCounter.syscalls.selects++; + ++ statCounter.syscalls.selects; if (select(maxfd, &read_mask, &write_mask, &errfds, &zero_tv) < 1) return incoming_sockets_accepted; - for (i = 0; i < nfds; i++) { + for (i = 0; i < nfds; ++i) { fd = fds[i]; if (FD_ISSET(fd, &read_mask)) { @@ -393,7 +393,7 @@ Comm::DoSelect(int msec) FD_ZERO(&pendingfds); - for (j = 0; j < (int) readfds.fd_count; j++) { + for (j = 0; j < (int) readfds.fd_count; ++j) { register int readfds_handle = readfds.fd_array[j]; no_bits = 1; @@ -411,12 +411,12 @@ Comm::DoSelect(int msec) if (FD_ISSET(fd, &readfds) && fd_table[fd].flags.read_pending) { FD_SET(fd, &pendingfds); - pending++; + ++pending; } } #if DEBUG_FDBITS - for (i = 0; i < maxfd; i++) { + for (i = 0; i < maxfd; ++i) { /* Check each open socket for a handler. */ if (fd_table[i].read_handler) { @@ -478,7 +478,7 @@ Comm::DoSelect(int msec) assert(readfds.fd_count <= (unsigned int) Biggest_FD); assert(pendingfds.fd_count <= (unsigned int) Biggest_FD); - for (j = 0; j < (int) readfds.fd_count; j++) { + for (j = 0; j < (int) readfds.fd_count; ++j) { register int readfds_handle = readfds.fd_array[j]; register int pendingfds_handle = pendingfds.fd_array[j]; register int osfhandle; @@ -530,7 +530,7 @@ Comm::DoSelect(int msec) F->flags.read_pending = 0; commUpdateReadBits(fd, NULL); hdl(fd, F->read_data); - statCounter.select_fds++; + ++ statCounter.select_fds; if (commCheckUdpIncoming) comm_select_udp_incoming(); @@ -545,7 +545,7 @@ Comm::DoSelect(int msec) assert(errfds.fd_count <= (unsigned int) Biggest_FD); - for (j = 0; j < (int) errfds.fd_count; j++) { + for (j = 0; j < (int) errfds.fd_count; ++j) { register int errfds_handle = errfds.fd_array[j]; for ( fd = Biggest_FD; fd; fd-- ) { @@ -560,14 +560,14 @@ Comm::DoSelect(int msec) F->write_handler = NULL; commUpdateWriteBits(fd, NULL); hdl(fd, F->write_data); - statCounter.select_fds++; + ++ statCounter.select_fds; } } } assert(writefds.fd_count <= (unsigned int) Biggest_FD); - for (j = 0; j < (int) writefds.fd_count; j++) { + for (j = 0; j < (int) writefds.fd_count; ++j) { register int writefds_handle = writefds.fd_array[j]; no_bits = 1; @@ -613,7 +613,7 @@ Comm::DoSelect(int msec) F->write_handler = NULL; commUpdateWriteBits(fd, NULL); hdl(fd, F->write_data); - statCounter.select_fds++; + ++ statCounter.select_fds; if (commCheckUdpIncoming) comm_select_udp_incoming(); @@ -720,7 +720,7 @@ examine_select(fd_set * readfds, fd_set * writefds) struct stat sb; debugs(5, 0, "examine_select: Examining open file descriptors..."); - for (fd = 0; fd < Squid_MaxFD; fd++) { + for (fd = 0; fd < Squid_MaxFD; ++fd) { FD_ZERO(&read_x); FD_ZERO(&write_x); tv.tv_sec = tv.tv_usec = 0; @@ -732,7 +732,7 @@ examine_select(fd_set * readfds, fd_set * writefds) else continue; - statCounter.syscalls.selects++; + ++ statCounter.syscalls.selects; errno = 0; if (!fstat(fd, &sb)) { @@ -792,10 +792,10 @@ commUpdateReadBits(int fd, PF * handler) { if (handler && !FD_ISSET(fd, &global_readfds)) { FD_SET(fd, &global_readfds); - nreadfds++; + ++nreadfds; } else if (!handler && FD_ISSET(fd, &global_readfds)) { FD_CLR(fd, &global_readfds); - nreadfds--; + --nreadfds; } } @@ -804,10 +804,10 @@ commUpdateWriteBits(int fd, PF * handler) { if (handler && !FD_ISSET(fd, &global_writefds)) { FD_SET(fd, &global_writefds); - nwritefds++; + ++nwritefds; } else if (!handler && FD_ISSET(fd, &global_writefds)) { FD_CLR(fd, &global_writefds); - nwritefds--; + --nwritefds; } }