kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Suppress more -Wparentheses warnings

Browse source 
[Fix GH-1958]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-09-21 10:31:11 +00:00
parent 2def52500f
commit 0d95805c2e
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dir.c
View file

@ -177,7 +177,7 @@ has_nonascii(const char *ptr, size_t len)
#endif #endif
#ifndef IFTODT #ifndef IFTODT
# define IFTODT(m) (((m) & S_IFMT) / ((~S_IFMT & S_IFMT-1) + 1)) # define IFTODT(m) (((m) & S_IFMT) / ((~S_IFMT & (S_IFMT-1)) + 1))
#endif #endif
typedef enum { typedef enum {

2
ext/openssl/openssl_missing.h
View file

@ -185,7 +185,7 @@ IMPL_KEY_ACCESSOR3(DSA, pqg, p, q, g, (p == obj->p || q == obj->q || g == obj->g
#if !defined(OPENSSL_NO_DH) #if !defined(OPENSSL_NO_DH)
IMPL_PKEY_GETTER(DH, dh) IMPL_PKEY_GETTER(DH, dh)
IMPL_KEY_ACCESSOR2(DH, key, pub_key, priv_key, (pub_key == obj->pub_key || (obj->priv_key && priv_key == obj->priv_key))) IMPL_KEY_ACCESSOR2(DH, key, pub_key, priv_key, (pub_key == obj->pub_key || (obj->priv_key && priv_key == obj->priv_key)))
IMPL_KEY_ACCESSOR3(DH, pqg, p, q, g, (p == obj->p || obj->q && q == obj->q || g == obj->g)) IMPL_KEY_ACCESSOR3(DH, pqg, p, q, g, (p == obj->p || (obj->q && q == obj->q) || g == obj->g))
static inline ENGINE *DH_get0_engine(DH *dh) { return dh->engine; } static inline ENGINE *DH_get0_engine(DH *dh) { return dh->engine; }
#endif #endif

4
ext/openssl/ossl_ssl.c
View file

@ -184,8 +184,10 @@ ossl_sslctx_set_minmax_proto_version(VALUE self, VALUE min_v, VALUE max_v)
for (i = 0; i < numberof(options_map); i++) { for (i = 0; i < numberof(options_map); i++) {
sum |= options_map[i].opts; sum |= options_map[i].opts;
if (min && min > options_map[i].ver || max && max < options_map[i].ver) if ((min && min > options_map[i].ver) ||
(max && max < options_map[i].ver)) {
opts |= options_map[i].opts; opts |= options_map[i].opts;
}
} }
SSL_CTX_clear_options(ctx, sum); SSL_CTX_clear_options(ctx, sum);
SSL_CTX_set_options(ctx, opts); SSL_CTX_set_options(ctx, opts);

3
win32/win32.c
View file

@ -6686,7 +6686,8 @@ constat_apply(HANDLE handle, struct constat *s, WCHAR w)
COORD pos; COORD pos;
if (!GetConsoleScreenBufferInfo(handle, &csbi)) return; if (!GetConsoleScreenBufferInfo(handle, &csbi)) return;
if (arg0 = (count > 0 && seq[0] > 0)) arg1 = seq[0]; arg0 = (count > 0 && seq[0] > 0);
if (arg0) arg1 = seq[0];
switch (w) { switch (w) {
case L'm': case L'm':
SetConsoleTextAttribute(handle, constat_attr(count, seq, csbi.wAttributes, s->vt100.attr, &s->vt100.reverse)); SetConsoleTextAttribute(handle, constat_attr(count, seq, csbi.wAttributes, s->vt100.attr, &s->vt100.reverse));