diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-11-09 21:37:48 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-11-11 20:00:07 -0800 |
| commit | ffa659dd6dd1fb8847bfdcc5e1e2be353b6395b6 (patch) | |
| tree | 14f40847a53af2465f457989fcadd1ecb28c0613 /src/process.c | |
| parent | 902a52ea9d7b6e6f56f7023009859072854a0fc7 (diff) | |
Fix gcc -Wwrite-strings warnings in AuthNames handling
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/process.c b/src/process.c index dbff404..2bb8d55 100644 --- a/src/process.c +++ b/src/process.c @@ -861,7 +861,7 @@ ProcessConnectionSetup ( int hisMajorVersion, hisMinorVersion; int myAuthCount, hisAuthCount; int found, i, j; - char *myAuthName, **hisAuthNames = NULL; + char **hisAuthNames = NULL; char *pData, *pStart, *pEnd; char *vendor = NULL; char *release = NULL; @@ -983,7 +983,7 @@ ProcessConnectionSetup ( { if (authUsableFlags[i]) { - myAuthName = _IceAuthNames[i]; + const char *myAuthName = _IceAuthNames[i]; for (j = 0; j < hisAuthCount && !found; j++) if (strcmp (myAuthName, hisAuthNames[j]) == 0) @@ -1838,7 +1838,7 @@ ProcessProtocolSetup ( int myAuthCount, hisAuthCount; int myOpcode, hisOpcode; int found, i, j; - char *myAuthName, **hisAuthNames = NULL; + char **hisAuthNames = NULL; char *protocolName; char *pData, *pStart, *pEnd; char *vendor = NULL; @@ -2009,7 +2009,8 @@ ProcessProtocolSetup ( _IceGetPaValidAuthIndices ( _IceProtocols[myOpcode - 1].protocol_name, - iceConn->connection_string, myAuthCount, myProtocol->auth_names, + iceConn->connection_string, myAuthCount, + (const char **) myProtocol->auth_names, &authUsableCount, authIndices); for (i = 0; i < myAuthCount; i++) @@ -2023,7 +2024,7 @@ ProcessProtocolSetup ( { if (authUsableFlags[i]) { - myAuthName = myProtocol->auth_names[i]; + const char *myAuthName = myProtocol->auth_names[i]; for (j = 0; j < hisAuthCount && !found; j++) if (strcmp (myAuthName, hisAuthNames[j]) == 0) |