diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 10:51:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 10:51:12 +0000 |
| commit | 68ae086bca45f47ee9462372933426d67809264d (patch) | |
| tree | eadce1e4fa8e9669588f38a1bb613f1f0adad5b8 | |
| parent | 73f0bb99d8fc21b645049a9bfeef6564ccc7a416 (diff) | |
WaE: gcc 4.6.0 various warnings
| -rw-r--r-- | sal/osl/unx/file_misc.cxx | 3 | ||||
| -rw-r--r-- | sal/osl/unx/file_url.cxx | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 961e29775b86..61f486995f29 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -697,8 +697,7 @@ static oslFileError oslDoMoveFile( const sal_Char* pszPath, const sal_Char* pszD if ( tErr != osl_File_E_None ) { - oslFileError tErrRemove; - tErrRemove=osl_psz_removeFile(pszDestPath); + osl_psz_removeFile(pszDestPath); return tErr; } diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index f9e8a877ee01..7d6913a8d1a5 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -520,7 +520,6 @@ namespace /* private */ oslFileError _osl_resolvepath( /*inout*/ sal_Unicode* path, - /*inout*/ sal_Unicode* current_pos, /*inout*/ bool* failed) { oslFileError ferr = osl_File_E_None; @@ -537,7 +536,6 @@ namespace /* private */ if (!TextToUnicode(resolved_path, strlen(resolved_path), path, PATH_MAX)) return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG); - current_pos = ustrtoend(path) - 1; } else { @@ -619,7 +617,6 @@ namespace /* private */ { ferr = _osl_resolvepath( path_resolved_so_far, - presolvedsf, &realpath_failed); if (osl_File_E_None != ferr) @@ -638,7 +635,6 @@ namespace /* private */ { ferr = _osl_resolvepath( path_resolved_so_far, - presolvedsf, &realpath_failed); if (osl_File_E_None != ferr) @@ -664,7 +660,6 @@ namespace /* private */ { ferr = _osl_resolvepath( path_resolved_so_far, - presolvedsf, &realpath_failed); if (osl_File_E_None != ferr) |