diff options
| author | walter harms <wharms@bfs.de> | 2017-09-07 18:46:39 +0200 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-04-30 15:32:31 -0700 |
| commit | 7b439c788b94849d4f07cda77518bec43ebbd9a6 (patch) | |
| tree | 70dd671c887a7d24043c3b3fde96586dae4f3792 | |
| parent | 348b9a46086ad72d6f29f2637036accff6630db4 (diff) | |
| download | xorg-lib-libICE-7b439c788b94849d4f07cda77518bec43ebbd9a6.tar.gz | |
connect.c: FIX 'iceConn' shadows a previous local, [-Wshadow]
In function 'IceOpenConnection': gcc give the following warning:
connect.c:106:11: warning: declaration of 'iceConn' shadows a previous local [-Wshadow]
fixed by renaming 2. iceConn to iConn (and all its uses)
Signed-off-by: Walter Harms <wharms@bfs.de>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | src/connect.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/connect.c b/src/connect.c index b52b566..2a77372 100644 --- a/src/connect.c +++ b/src/connect.c @@ -104,11 +104,11 @@ IceOpenConnection ( * OK, we found a connection. Make sure we can reuse it. */ - IceConn iceConn = _IceConnectionObjs[i]; + IceConn iConn = _IceConnectionObjs[i]; - if (iceConn->want_to_close || iceConn->free_asap || - (context && iceConn->context && - iceConn->context != context)) + if (iConn->want_to_close || iConn->free_asap || + (context && iConn->context && + iConn->context != context)) { /* force a new connection to be created */ break; @@ -116,20 +116,20 @@ IceOpenConnection ( if (majorOpcodeCheck) { - for (j = iceConn->his_min_opcode; - j <= iceConn->his_max_opcode; j++) + for (j = iConn->his_min_opcode; + j <= iConn->his_max_opcode; j++) { - if (iceConn->process_msg_info[ - j - iceConn->his_min_opcode].in_use && - iceConn->process_msg_info[ - j - iceConn->his_min_opcode].my_opcode == + if (iConn->process_msg_info[ + j - iConn->his_min_opcode].in_use && + iConn->process_msg_info[ + j - iConn->his_min_opcode].my_opcode == majorOpcodeCheck) break; } - if (j <= iceConn->his_max_opcode || - (iceConn->protosetup_to_you && - iceConn->protosetup_to_you->my_opcode == + if (j <= iConn->his_max_opcode || + (iConn->protosetup_to_you && + iConn->protosetup_to_you->my_opcode == majorOpcodeCheck)) { /* force a new connection to be created */ @@ -137,10 +137,10 @@ IceOpenConnection ( } } - iceConn->open_ref_count++; - if (context && !iceConn->context) - iceConn->context = context; - return (iceConn); + iConn->open_ref_count++; + if (context && !iConn->context) + iConn->context = context; + return (iConn); } } } |