External/libvirt
1
0
Fork 0
Code

errcode is typedef by mingw, rename an argument name

Browse Source 
Fixes the following warning:
util/virterror.c:1242:31: warning: declaration of 'errcode' shadows a global declaration [-Wshadow]
This commit is contained in:
Marc-André Lureau 2012-01-25 21:13:21 +01:00 committed by Eric Blake
parent 5f1767e845
commit 75d3612ef8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/virterror.c
View File

@ -1228,7 +1228,7 @@ virErrorMsg(virErrorNumber error, const char *info)
* virReportErrorHelper: * virReportErrorHelper:
* *
* @domcode: the virErrorDomain indicating where it's coming from * @domcode: the virErrorDomain indicating where it's coming from
* @errcode: the virErrorNumber code for the error * @errorcode: the virErrorNumber code for the error
* @filename: Source file error is dispatched from * @filename: Source file error is dispatched from
* @funcname: Function error is dispatched from * @funcname: Function error is dispatched from
* @linenr: Line number error is dispatched from * @linenr: Line number error is dispatched from
@ -1239,7 +1239,7 @@ virErrorMsg(virErrorNumber error, const char *info)
* ReportError * ReportError
*/ */
void virReportErrorHelper(int domcode, void virReportErrorHelper(int domcode,
int errcode, int errorcode,
const char *filename, const char *filename,
const char *funcname, const char *funcname,
size_t linenr, size_t linenr,
@ -1258,9 +1258,9 @@ void virReportErrorHelper(int domcode,
errorMessage[0] = '\0'; errorMessage[0] = '\0';
} }
virerr = virErrorMsg(errcode, (errorMessage[0] ? errorMessage : NULL)); virerr = virErrorMsg(errorcode, (errorMessage[0] ? errorMessage : NULL));
virRaiseErrorFull(filename, funcname, linenr, virRaiseErrorFull(filename, funcname, linenr,
domcode, errcode, VIR_ERR_ERROR, domcode, errorcode, VIR_ERR_ERROR,
virerr, errorMessage, NULL, virerr, errorMessage, NULL,
-1, -1, virerr, errorMessage); -1, -1, virerr, errorMessage);
errno = save_errno; errno = save_errno;