summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2019-05-21 11:25:42 +0200
committerMarcel Raad <Marcel.Raad@teamviewer.com>2019-05-22 10:06:33 +0200
commit159ea554afb69f429098b0b5e7aa841149e93f2d (patch)
tree5260fe1276cac531c33d07f272e392b342bcc4e0
parentacb097ca7f2ac6304bc664dd9154114fd27bffca (diff)
downloadcurl-159ea554afb69f429098b0b5e7aa841149e93f2d.tar.gz
examples: fix "clarify calculation precedence" warnings
Closes https://github.com/curl/curl/pull/3919
-rw-r--r--docs/examples/ephiperfifo.c8
-rw-r--r--docs/examples/evhiperfifo.c7
-rw-r--r--docs/examples/ghiper.c11
-rw-r--r--docs/examples/hiperfifo.c7
4 files changed, 18 insertions, 15 deletions
diff --git a/docs/examples/ephiperfifo.c b/docs/examples/ephiperfifo.c
index 2b8f4cc6e..bc4b0f057 100644
--- a/docs/examples/ephiperfifo.c
+++ b/docs/examples/ephiperfifo.c
@@ -207,8 +207,8 @@ static void event_cb(GlobalInfo *g, int fd, int revents)
CURLMcode rc;
struct itimerspec its;
- int action = (revents & EPOLLIN ? CURL_CSELECT_IN : 0) |
- (revents & EPOLLOUT ? CURL_CSELECT_OUT : 0);
+ int action = ((revents & EPOLLIN) ? CURL_CSELECT_IN : 0) |
+ ((revents & EPOLLOUT) ? CURL_CSELECT_OUT : 0);
rc = curl_multi_socket_action(g->multi, fd, action, &g->still_running);
mcode_or_die("event_cb: curl_multi_socket_action", rc);
@@ -273,8 +273,8 @@ static void setsock(SockInfo *f, curl_socket_t s, CURL *e, int act,
GlobalInfo *g)
{
struct epoll_event ev;
- int kind = (act & CURL_POLL_IN ? EPOLLIN : 0) |
- (act & CURL_POLL_OUT ? EPOLLOUT : 0);
+ int kind = ((act & CURL_POLL_IN) ? EPOLLIN : 0) |
+ ((act & CURL_POLL_OUT) ? EPOLLOUT : 0);
if(f->sockfd) {
if(epoll_ctl(g->epfd, EPOLL_CTL_DEL, f->sockfd, NULL))
diff --git a/docs/examples/evhiperfifo.c b/docs/examples/evhiperfifo.c
index 38ea312be..4d77d5294 100644
--- a/docs/examples/evhiperfifo.c
+++ b/docs/examples/evhiperfifo.c
@@ -203,8 +203,8 @@ static void event_cb(EV_P_ struct ev_io *w, int revents)
GlobalInfo *g = (GlobalInfo*) w->data;
CURLMcode rc;
- int action = (revents&EV_READ?CURL_POLL_IN:0)|
- (revents&EV_WRITE?CURL_POLL_OUT:0);
+ int action = ((revents & EV_READ) ? CURL_POLL_IN : 0) |
+ ((revents & EV_WRITE) ? CURL_POLL_OUT : 0);
rc = curl_multi_socket_action(g->multi, w->fd, action, &g->still_running);
mcode_or_die("event_cb: curl_multi_socket_action", rc);
check_multi_info(g);
@@ -247,7 +247,8 @@ static void setsock(SockInfo *f, curl_socket_t s, CURL *e, int act,
{
printf("%s \n", __PRETTY_FUNCTION__);
- int kind = (act&CURL_POLL_IN?EV_READ:0)|(act&CURL_POLL_OUT?EV_WRITE:0);
+ int kind = ((act & CURL_POLL_IN) ? EV_READ : 0) |
+ ((act & CURL_POLL_OUT) ? EV_WRITE : 0);
f->sockfd = s;
f->action = act;
diff --git a/docs/examples/ghiper.c b/docs/examples/ghiper.c
index e9d1fcea7..1fa3b5940 100644
--- a/docs/examples/ghiper.c
+++ b/docs/examples/ghiper.c
@@ -182,8 +182,8 @@ static gboolean event_cb(GIOChannel *ch, GIOCondition condition, gpointer data)
int fd = g_io_channel_unix_get_fd(ch);
int action =
- (condition & G_IO_IN ? CURL_CSELECT_IN : 0) |
- (condition & G_IO_OUT ? CURL_CSELECT_OUT : 0);
+ ((condition & G_IO_IN) ? CURL_CSELECT_IN : 0) |
+ ((condition & G_IO_OUT) ? CURL_CSELECT_OUT : 0);
rc = curl_multi_socket_action(g->multi, fd, action, &g->still_running);
mcode_or_die("event_cb: curl_multi_socket_action", rc);
@@ -218,7 +218,8 @@ static void setsock(SockInfo *f, curl_socket_t s, CURL *e, int act,
GlobalInfo *g)
{
GIOCondition kind =
- (act&CURL_POLL_IN?G_IO_IN:0)|(act&CURL_POLL_OUT?G_IO_OUT:0);
+ ((act & CURL_POLL_IN) ? G_IO_IN : 0) |
+ ((act & CURL_POLL_OUT) ? G_IO_OUT : 0);
f->sockfd = s;
f->action = act;
@@ -255,8 +256,8 @@ static int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp)
else {
if(!fdp) {
MSG_OUT("Adding data: %s%s\n",
- what&CURL_POLL_IN?"READ":"",
- what&CURL_POLL_OUT?"WRITE":"");
+ (what & CURL_POLL_IN) ? "READ" : "",
+ (what & CURL_POLL_OUT) ? "WRITE" : "");
addsock(s, e, what, g);
}
else {
diff --git a/docs/examples/hiperfifo.c b/docs/examples/hiperfifo.c
index d1228f829..a50522a8e 100644
--- a/docs/examples/hiperfifo.c
+++ b/docs/examples/hiperfifo.c
@@ -202,8 +202,8 @@ static void event_cb(int fd, short kind, void *userp)
CURLMcode rc;
int action =
- (kind & EV_READ ? CURL_CSELECT_IN : 0) |
- (kind & EV_WRITE ? CURL_CSELECT_OUT : 0);
+ ((kind & EV_READ) ? CURL_CSELECT_IN : 0) |
+ ((kind & EV_WRITE) ? CURL_CSELECT_OUT : 0);
rc = curl_multi_socket_action(g->multi, fd, action, &g->still_running);
mcode_or_die("event_cb: curl_multi_socket_action", rc);
@@ -249,7 +249,8 @@ static void setsock(SockInfo *f, curl_socket_t s, CURL *e, int act,
GlobalInfo *g)
{
int kind =
- (act&CURL_POLL_IN?EV_READ:0)|(act&CURL_POLL_OUT?EV_WRITE:0)|EV_PERSIST;
+ ((act & CURL_POLL_IN) ? EV_READ : 0) |
+ ((act & CURL_POLL_OUT) ? EV_WRITE : 0) | EV_PERSIST;
f->sockfd = s;
f->action = act;