From fb123f93f9f5ce42c8e5785d2f8e0edaf951740e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 26 Mar 2014 19:21:20 +0000 Subject: Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2. --- src/VBox/Runtime/r3/posix/pathhost-posix.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/VBox/Runtime/r3/posix/pathhost-posix.cpp') diff --git a/src/VBox/Runtime/r3/posix/pathhost-posix.cpp b/src/VBox/Runtime/r3/posix/pathhost-posix.cpp index 5390fe57..6f75c27b 100644 --- a/src/VBox/Runtime/r3/posix/pathhost-posix.cpp +++ b/src/VBox/Runtime/r3/posix/pathhost-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -134,7 +134,7 @@ static bool rtPathConvInitIsUtf8(const char *pszCodeset) * @param pvUser1 Unused. * @param pvUser2 Unused. */ -static DECLCALLBACK(int32_t) rtPathConvInitOnce(void *pvUser1, void *pvUser2) +static DECLCALLBACK(int32_t) rtPathConvInitOnce(void *pvUser) { /* * Read the environment variable, no mercy on misconfigs here except that @@ -172,7 +172,7 @@ static DECLCALLBACK(int32_t) rtPathConvInitOnce(void *pvUser1, void *pvUser2) g_enmUtf8ToFsIdx = RTSTRICONV_UTF8_TO_LOCALE; } - NOREF(pvUser1); NOREF(pvUser2); + NOREF(pvUser); return VINF_SUCCESS; } @@ -181,7 +181,7 @@ int rtPathToNative(char const **ppszNativePath, const char *pszPath, const char { *ppszNativePath = NULL; - int rc = RTOnce(&g_OnceInitPathConv, rtPathConvInitOnce, NULL, NULL); + int rc = RTOnce(&g_OnceInitPathConv, rtPathConvInitOnce, NULL); if (RT_SUCCESS(rc)) { if (g_fPassthruUtf8 || !*pszPath) @@ -208,7 +208,7 @@ int rtPathFromNative(const char **ppszPath, const char *pszNativePath, const cha { *ppszPath = NULL; - int rc = RTOnce(&g_OnceInitPathConv, rtPathConvInitOnce, NULL, NULL); + int rc = RTOnce(&g_OnceInitPathConv, rtPathConvInitOnce, NULL); if (RT_SUCCESS(rc)) { if (g_fPassthruUtf8 || !*pszNativePath) @@ -246,7 +246,7 @@ void rtPathFreeIprt(const char *pszPath, const char *pszNativePath) int rtPathFromNativeCopy(char *pszPath, size_t cbPath, const char *pszNativePath, const char *pszBasePath) { - int rc = RTOnce(&g_OnceInitPathConv, rtPathConvInitOnce, NULL, NULL); + int rc = RTOnce(&g_OnceInitPathConv, rtPathConvInitOnce, NULL); if (RT_SUCCESS(rc)) { if (g_fPassthruUtf8 || !*pszNativePath) @@ -266,7 +266,7 @@ int rtPathFromNativeCopy(char *pszPath, size_t cbPath, const char *pszNativePath int rtPathFromNativeDup(char **ppszPath, const char *pszNativePath, const char *pszBasePath) { - int rc = RTOnce(&g_OnceInitPathConv, rtPathConvInitOnce, NULL, NULL); + int rc = RTOnce(&g_OnceInitPathConv, rtPathConvInitOnce, NULL); if (RT_SUCCESS(rc)) { if (g_fPassthruUtf8 || !*pszNativePath) -- cgit v1.2.1