[Libreoffice-commits] core.git: sal/android sal/cpprt sal/osl sal/qa sal/rtl sal/test sal/workben
Tor Lillqvist
tml at collabora.com
Thu Apr 3 00:02:55 PDT 2014
sal/android/lo-bootstrap.c | 2
sal/android/uthash.h | 3
sal/cpprt/operators_new_delete.cxx | 30 --
sal/osl/all/debugbase.cxx | 1
sal/osl/all/filepath.c | 2
sal/osl/all/loadmodulerelative.cxx | 1
sal/osl/all/utility.cxx | 2
sal/osl/unx/backtrace.c | 4
sal/osl/unx/backtrace.h | 2
sal/osl/unx/conditn.cxx | 3
sal/osl/unx/file_error_transl.cxx | 1
sal/osl/unx/file_error_transl.h | 1
sal/osl/unx/file_misc.cxx | 1
sal/osl/unx/file_path_helper.hxx | 5
sal/osl/unx/file_stat.cxx | 1
sal/osl/unx/file_url.cxx | 1
sal/osl/unx/file_volume.cxx | 2
sal/osl/unx/interlck.c | 1
sal/osl/unx/module.cxx | 2
sal/osl/unx/mutex.c | 2
sal/osl/unx/nlsupport.c | 2
sal/osl/unx/osxlocale.cxx | 1
sal/osl/unx/pipe.c | 10
sal/osl/unx/process.cxx | 11
sal/osl/unx/process_impl.cxx | 2
sal/osl/unx/profile.cxx | 24 --
sal/osl/unx/security.cxx | 9
sal/osl/unx/signal.c | 3
sal/osl/unx/socket.c | 25 --
sal/osl/unx/system.c | 1
sal/osl/unx/time.c | 5
sal/osl/w32/dllentry.c | 3
sal/osl/w32/file.cxx | 26 --
sal/osl/w32/file_dirvol.cxx | 77 ------
sal/osl/w32/file_url.cxx | 22 -
sal/osl/w32/module.cxx | 6
sal/osl/w32/nlsupport.c | 4
sal/osl/w32/path_helper.cxx | 2
sal/osl/w32/pipe.c | 4
sal/osl/w32/process.cxx | 3
sal/osl/w32/procimpl.cxx | 19 -
sal/osl/w32/profile.cxx | 56 ----
sal/osl/w32/salinit.cxx | 2
sal/osl/w32/security.c | 16 -
sal/osl/w32/signal.cxx | 2
sal/osl/w32/socket.cxx | 3
sal/osl/w32/sockimpl.h | 1
sal/osl/w32/tempfile.cxx | 9
sal/osl/w32/thread.c | 8
sal/osl/w32/time.c | 11
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 27 --
sal/qa/OStringBuffer/rtl_String_Const.h | 10
sal/qa/OStringBuffer/rtl_String_Utils.cxx | 2
sal/qa/OStringBuffer/rtl_String_Utils.hxx | 10
sal/qa/OStringBuffer/rtl_String_Utils_Const.h | 2
sal/qa/osl/condition/osl_Condition.cxx | 21 -
sal/qa/osl/condition/osl_Condition_Const.h | 2
sal/qa/osl/file/osl_File.cxx | 155 -------------
sal/qa/osl/file/osl_File_Const.h | 16 -
sal/qa/osl/file/osl_old_test_file.cxx | 4
sal/qa/osl/file/test_cpy_wrt_file.cxx | 1
sal/qa/osl/module/osl_Module.cxx | 17 -
sal/qa/osl/module/osl_Module_Const.h | 2
sal/qa/osl/mutex/osl_Mutex.cxx | 31 --
sal/qa/osl/mutex/osl_Mutex_Const.h | 1
sal/qa/osl/pipe/osl_Pipe.cxx | 27 --
sal/qa/osl/process/osl_Thread.cxx | 17 -
sal/qa/osl/process/osl_process.cxx | 17 -
sal/qa/osl/process/osl_process_child.cxx | 11
sal/qa/osl/profile/osl_old_testprofile.cxx | 2
sal/qa/osl/security/osl_Security.cxx | 23 -
sal/qa/osl/socket/osl_AcceptorSocket.cxx | 12 -
sal/qa/osl/socket/osl_ConnectorSocket.cxx | 11
sal/qa/osl/socket/osl_DatagramSocket.cxx | 9
sal/qa/osl/socket/osl_Socket.cxx | 109 ---------
sal/qa/osl/socket/osl_Socket2.cxx | 53 ----
sal/qa/osl/socket/osl_SocketAddr.cxx | 24 --
sal/qa/osl/socket/osl_Socket_Const.h | 7
sal/qa/osl/socket/osl_Socket_Const_orig.h | 10
sal/qa/osl/socket/osl_Socket_tests.cxx | 7
sal/qa/osl/socket/osl_StreamSocket.cxx | 28 --
sal/qa/osl/socket/sockethelper.cxx | 3
sal/qa/osl/socket/sockethelper.hxx | 1
sal/qa/rtl/alloc/rtl_alloc.cxx | 2
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 13 -
sal/qa/rtl/cipher/rtl_cipher.cxx | 7
sal/qa/rtl/crc32/rtl_crc32.cxx | 7
sal/qa/rtl/digest/rtl_digest.cxx | 1
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 7
sal/qa/rtl/locale/rtl_locale.cxx | 10
sal/qa/rtl/logfile/rtl_logfile.cxx | 7
sal/qa/rtl/ostring/rtl_OString2.cxx | 17 -
sal/qa/rtl/ostring/rtl_str.cxx | 34 --
sal/qa/rtl/ostring/rtl_string.cxx | 11
sal/qa/rtl/oustring/rtl_OUString2.cxx | 9
sal/qa/rtl/oustring/rtl_ustr.cxx | 51 ----
sal/qa/rtl/process/child_process.cxx | 1
sal/qa/rtl/process/child_process_id.cxx | 1
sal/qa/rtl/process/rtl_Process.cxx | 3
sal/qa/rtl/process/rtl_Process_Const.h | 2
sal/qa/rtl/random/rtl_random.cxx | 5
sal/qa/rtl/textenc/rtl_tencinfo.cxx | 3
sal/qa/rtl/textenc/rtl_textcvt.cxx | 1
sal/qa/rtl/uri/rtl_Uri.cxx | 6
sal/qa/rtl/uri/rtl_testuri.cxx | 1
sal/qa/rtl/uuid/rtl_Uuid.cxx | 4
sal/qa/systools/test_comtools.cxx | 3
sal/rtl/alloc_arena.cxx | 11
sal/rtl/alloc_arena.hxx | 3
sal/rtl/alloc_cache.cxx | 14 -
sal/rtl/alloc_cache.hxx | 5
sal/rtl/alloc_impl.hxx | 2
sal/rtl/bootstrap.cxx | 35 ---
sal/rtl/byteseq.cxx | 12 -
sal/rtl/cmdargs.cxx | 1
sal/rtl/hash.cxx | 2
sal/rtl/math.cxx | 11
sal/rtl/uuid.cxx | 5
sal/test/test_salmain.cxx | 1
sal/test/test_salmainwithargs.cxx | 1
sal/test/testbootstrap.cxx | 4
sal/workben/clipboardwben/testcopy/StdAfx.h | 2
sal/workben/clipboardwben/testcopy/XTDataObject.cxx | 57 ----
sal/workben/clipboardwben/testcopy/XTDataObject.hxx | 4
sal/workben/clipboardwben/testcopy/cbcpytest.cxx | 23 -
sal/workben/clipboardwben/testpaste/StdAfx.h | 2
sal/workben/clipboardwben/testpaste/cbptest.cxx | 11
sal/workben/clipboardwben/testviewer/StdAfx.h | 2
sal/workben/clipboardwben/testviewer/cbvtest.cxx | 7
sal/workben/getlocaleinfotest.cxx | 2
sal/workben/t_cipher.c | 1
sal/workben/t_digest.c | 5
sal/workben/t_ojp_exe.cxx | 2
sal/workben/test.cxx | 2
sal/workben/testfile.cxx | 233 --------------------
sal/workben/testpip2.cxx | 7
sal/workben/testpipe.cxx | 6
sal/workben/testproc.cxx | 2
138 files changed, 1787 deletions(-)
New commits:
commit 335cd830b0bd430d282687df58a91a69dac2c528
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 3 10:00:55 2014 +0300
Kill superfluous vertical whitespace
Change-Id: I8c37b9ec45836f9c0e2dc0cf232f96f23c7c36d3
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index c43d3ba..49f9b3a 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -348,7 +348,6 @@ get_jni_string_array(JNIEnv *env,
return JNI_TRUE;
}
-
// public static native int getpid();
__attribute__ ((visibility("default")))
@@ -362,7 +361,6 @@ Java_org_libreoffice_android_Bootstrap_getpid(JNIEnv* env,
return getpid();
}
-
// public static native void system(String cmdline);
__attribute__ ((visibility("default")))
diff --git a/sal/android/uthash.h b/sal/android/uthash.h
index 73cc36a..f31edaa 100644
--- a/sal/android/uthash.h
+++ b/sal/android/uthash.h
@@ -225,7 +225,6 @@ do {
HASH_FSCK(hh,head); \
} while (0)
-
/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */
#define HASH_FIND_STR(head,findstr,out) \
HASH_FIND(hh,head,findstr,strlen(findstr),out)
@@ -333,7 +332,6 @@ do {
bkt = (hashv) & (num_bkts-1); \
} while (0)
-
/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at
* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */
#define HASH_SAX(key,keylen,num_bkts,hashv,bkt) \
@@ -751,7 +749,6 @@ do {
uthash_expand_fyi(tbl); \
} while(0)
-
/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */
/* Note that HASH_SORT assumes the hash handle name to be hh.
* HASH_SRT was added to allow the hash handle name to be passed in. */
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx
index b82eb8c..081b958 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -23,10 +23,8 @@
#include <osl/diagnose.h>
#include <rtl/alloc.h>
-
// AllocatorTraits
-
namespace
{
@@ -70,8 +68,6 @@ struct AllocatorTraits
}
};
-
-
struct VectorTraits : public AllocatorTraits
{
static const signature_type g_signature;
@@ -95,18 +91,14 @@ const AllocatorTraits::signature_type ScalarTraits::g_signature = "new() ";
} // anonymous namespace
-
// Allocator
-
static void default_handler (void)
{
// Multithreading race in 'std::set_new_handler()' call sequence below.
throw std::bad_alloc();
}
-
-
static void* allocate (
std::size_t n, AllocatorTraits const & rTraits)
SAL_THROW((std::bad_alloc))
@@ -128,8 +120,6 @@ static void* allocate (
}
}
-
-
static void* allocate_nothrow (
std::size_t n, AllocatorTraits const & rTraits)
SAL_THROW(())
@@ -144,8 +134,6 @@ static void* allocate_nothrow (
}
}
-
-
static void deallocate (void * p, AllocatorTraits const & rTraits)
SAL_THROW(())
{
@@ -155,70 +143,52 @@ static void deallocate (void * p, AllocatorTraits const & rTraits)
}
}
-
// T * p = new T; delete p;
-
void* SAL_CALL operator new (std::size_t n) throw (std::bad_alloc)
{
return allocate (n, ScalarTraits());
}
-
-
void SAL_CALL operator delete (void * p) throw ()
{
deallocate (p, ScalarTraits());
}
-
// T * p = new(nothrow) T; delete(nothrow) p;
-
void* SAL_CALL operator new (std::size_t n, std::nothrow_t const &) throw ()
{
return allocate_nothrow (n, ScalarTraits());
}
-
-
void SAL_CALL operator delete (void * p, std::nothrow_t const &) throw ()
{
deallocate (p, ScalarTraits());
}
-
// T * p = new T[n]; delete[] p;
-
void* SAL_CALL operator new[] (std::size_t n) throw (std::bad_alloc)
{
return allocate (n, VectorTraits());
}
-
-
void SAL_CALL operator delete[] (void * p) throw ()
{
deallocate (p, VectorTraits());
}
-
// T * p = new(nothrow) T[n]; delete(nothrow)[] p;
-
void* SAL_CALL operator new[] (std::size_t n, std::nothrow_t const &) throw ()
{
return allocate_nothrow (n, VectorTraits());
}
-
-
void SAL_CALL operator delete[] (void * p, std::nothrow_t const &) throw ()
{
deallocate (p, VectorTraits());
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 75cd846..57f70d8 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "rtl/strbuf.hxx"
#include "rtl/string.hxx"
#include "rtl/ustring.hxx"
diff --git a/sal/osl/all/filepath.c b/sal/osl/all/filepath.c
index 1fc0e74..5390c9a 100644
--- a/sal/osl/all/filepath.c
+++ b/sal/osl/all/filepath.c
@@ -25,7 +25,6 @@ static sal_uInt32 SAL_CALL osl_defCalcTextWidth( rtl_uString *ustrText )
return ustrText ? ustrText->length : 0;
}
-
oslFileError SAL_CALL osl_abbreviateSystemPath( rtl_uString *ustrSystemPath, rtl_uString **pustrCompacted, sal_uInt32 uMaxWidth, oslCalcTextWidthFunc pfnCalcWidth )
{
oslFileError error = osl_File_E_None;
@@ -112,5 +111,4 @@ oslFileError SAL_CALL osl_abbreviateSystemPath( rtl_uString *ustrSystemPath, rtl
return error;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index 2e77690..a3dc71e 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "sal/config.h"
#include <cstddef>
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
index adafdbb..20ae1a4 100644
--- a/sal/osl/all/utility.cxx
+++ b/sal/osl/all/utility.cxx
@@ -19,7 +19,6 @@
#include "osl/time.h"
-
/*
* mfe : maybe it would be wishful to include initialization
* of the global timer in dllmain or _init directly.
@@ -42,7 +41,6 @@ public:
return osl_getGlobalTimer();
}
-
};
static OGlobalTimer aGlobalTimer;
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 3b50cdc..1b664d6 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifdef SOLARIS
#include <dlfcn.h>
@@ -55,7 +54,6 @@
#endif /* defined SPARC or INTEL */
-
int backtrace( void **buffer, int max_frames )
{
jmp_buf ctx;
@@ -130,7 +128,6 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
#endif /* defined SOLARIS */
-
#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined(DRAGONFLY)
#include <dlfcn.h>
#include <pthread.h>
@@ -233,7 +230,6 @@ int backtrace( void **buffer, int max_frames )
return i;
}
-
void backtrace_symbols_fd( void **buffer, int size, int fd )
{
FILE *fp = fdopen( fd, "w" );
diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
index 04e3953..c7fb992 100644
--- a/sal/osl/unx/backtrace.h
+++ b/sal/osl/unx/backtrace.h
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#if defined (SOLARIS) || defined (FREEBSD) || defined (NETBSD) || \
defined (OPENBSD) || defined (DRAGONFLY) || defined (MACOSX)
@@ -42,7 +41,6 @@ struct frame {
};
#endif
-
#ifdef __cplusplus
} /* extern "C" */
#endif
diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx
index ddf483a..36fd44a 100644
--- a/sal/osl/unx/conditn.cxx
+++ b/sal/osl/unx/conditn.cxx
@@ -28,7 +28,6 @@
#include <osl/conditn.h>
#include <osl/time.h>
-
typedef struct _oslConditionImpl
{
pthread_cond_t m_Condition;
@@ -36,7 +35,6 @@ typedef struct _oslConditionImpl
bool m_State;
} oslConditionImpl;
-
oslCondition SAL_CALL osl_createCondition()
{
oslConditionImpl* pCond;
@@ -331,5 +329,4 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
return State;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx
index 59700b9..4207746 100644
--- a/sal/osl/unx/file_error_transl.cxx
+++ b/sal/osl/unx/file_error_transl.cxx
@@ -227,5 +227,4 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
return osl_error;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_error_transl.h b/sal/osl/unx/file_error_transl.h
index f261974..7033e38 100644
--- a/sal/osl/unx/file_error_transl.h
+++ b/sal/osl/unx/file_error_transl.h
@@ -54,7 +54,6 @@ extern "C"
oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno);
-
#ifdef __cplusplus
}
#endif
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 695b89d..f238f28 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -306,7 +306,6 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirect
if (NULL == pEntry)
return osl_File_E_NOENT;
-
#if defined(MACOSX)
// convert decomposed filename to precomposed unicode
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 4a21062..a2b4607 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -20,12 +20,10 @@
#ifndef _OSL_FILE_PATH_HELPER_HXX_
#define _OSL_FILE_PATH_HELPER_HXX_
-
#include "file_path_helper.h"
#include <rtl/ustring.hxx>
-
namespace osl
{
@@ -173,11 +171,8 @@ namespace osl
&ustrPathFound.pData);
}
-
} // namespace osl
-
#endif /* #ifndef _OSL_PATH_HELPER_HXX_ */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 5d6bd10..6c5f6a6 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -109,7 +109,6 @@ namespace
pStat->uAttributes |= osl_File_Attribute_Executable;
}
-
inline void set_file_hidden_status(const rtl::OUString& file_path, oslFileStatus* pStat)
{
pStat->uAttributes = osl::systemPathIsHiddenFileOrDirectoryEntry(file_path) ? osl_File_Attribute_Hidden : 0;
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index f3e0e9c..c189a8b 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -251,7 +251,6 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
return osl_File_E_INVAL;
}
-
/* check if system path starts with ~ or ~user and replace it with the appropriate home dir */
if( '~' == ustrSystemPath->buffer[0] )
{
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index 0473b9f..ce036fc 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -44,7 +44,6 @@
#define FREEBSD 1
#endif
-
#if defined(SOLARIS)
#include <sys/mnttab.h>
@@ -220,7 +219,6 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI
# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (true)
#endif /* HAVE_STATFS_H */
-
static oslFileError osl_psz_getVolumeInformation (
const sal_Char* pszDirectory, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask)
{
diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c
index cd8b5d2..b2862df 100644
--- a/sal/osl/unx/interlck.c
+++ b/sal/osl/unx/interlck.c
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "system.h"
#include <osl/interlck.h>
diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx
index 3020571..1ebdfac 100644
--- a/sal/osl/unx/module.cxx
+++ b/sal/osl/unx/module.cxx
@@ -106,7 +106,6 @@ static bool getModulePathFromAddress(void * address, rtl_String ** path) {
return result;
}
-
#ifndef DISABLE_DYNLOADING
/*****************************************************************************/
@@ -244,7 +243,6 @@ osl_getSymbol(oslModule Module, rtl_uString* pSymbolName)
return (void *) osl_getFunctionSymbol(Module, pSymbolName);
}
-
/*****************************************************************************/
/* osl_getAsciiFunctionSymbol */
/*****************************************************************************/
diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.c
index a2a6df7..a8eb99d 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.c
@@ -36,7 +36,6 @@ typedef struct _oslMutexImpl
pthread_mutex_t mutex;
} oslMutexImpl;
-
/*****************************************************************************/
/* osl_createMutex */
/*****************************************************************************/
@@ -155,7 +154,6 @@ sal_Bool SAL_CALL osl_releaseMutex(oslMutexImpl *pMutex)
return sal_False;
}
-
static oslMutexImpl globalMutexImpl;
static void globalMutexInitImpl(void) {
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index ac5ef18..943aa36 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -41,7 +41,6 @@ typedef struct {
const rtl_TextEncoding value;
} _pair;
-
/*****************************************************************************
compare function for binary search
*****************************************************************************/
@@ -85,7 +84,6 @@ _pair_search (const char *key, const _pair *base, unsigned int member )
return NULL;
}
-
/*****************************************************************************
convert rtl_Locale to locale string
*****************************************************************************/
diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index 969c467..7618970 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sal/types.h>
#include <assert.h>
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index 79e847e..b1263c8 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -38,7 +38,6 @@
sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax);
oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security);
-
static struct
{
int errcode;
@@ -62,7 +61,6 @@ static struct
{ -1, osl_Pipe_E_invalidError }
};
-
/* map */
/* mfe: NOT USED
static int osl_NativeFromPipeError(oslPipeError errorCode)
@@ -88,11 +86,9 @@ static oslPipeError osl_PipeErrorFromNative(int nativeType)
return PipeError[i].error;
}
-
/* macros */
#define ERROR_FROM_NATIVE(y) osl_PipeErrorFromNative(y)
-
oslPipe __osl_createPipeImpl()
{
oslPipe pPipeImpl;
@@ -115,7 +111,6 @@ void __osl_destroyPipeImpl(oslPipe pImpl)
free(pImpl);
}
-
oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions Options, oslSecurity Security)
{
oslPipe pPipe=0;
@@ -307,7 +302,6 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
if ( !Security )
chmod(name,S_IRWXU | S_IRWXG |S_IRWXO);
-
strncpy(pPipe->m_Name, name, sizeof(pPipe->m_Name) - 1);
if ( listen(pPipe->m_Socket, 5) < 0 )
@@ -413,7 +407,6 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
}
#endif /* LINUX */
-
nRet = shutdown(ConnFD, 2);
if ( nRet < 0 )
{
@@ -435,7 +428,6 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
/* OSL_TRACE("Out osl_destroyPipe"); */
}
-
oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
{
int s, flags;
@@ -547,7 +539,6 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe,
(sal_Char*)pBuffer,
BytesToSend, 0);
-
if ( nRet <= 0 )
{
OSL_TRACE("osl_sendPipe failed : %i '%s'",nRet,strerror(errno));
@@ -562,7 +553,6 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe)
return ERROR_FROM_NATIVE(errno);
}
-
sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 n )
{
/* loop until all desired bytes were send or an error occurred */
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index a98e48a..abe4bc9 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -36,7 +36,6 @@
# endif
#endif
-
#if defined(FREEBSD) || defined(NETBSD) || defined(DRAGONFLY)
#include <machine/param.h>
#endif
@@ -167,7 +166,6 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
*
*****************************************************************************/
-
sal_Bool osl_sendResourcePipe(oslPipe /*pPipe*/, oslSocket /*pSocket*/)
{
return osl_Process_E_InvalidError;
@@ -179,8 +177,6 @@ oslSocket osl_receiveResourcePipe(oslPipe /*pPipe*/)
return pSocket;
}
-
-
/******************************************************************************
*
* Functions for starting a process
@@ -389,7 +385,6 @@ static void ChildStatusProc(void *pData)
child_pid = pid;
}
-
if ( child_pid > 0 )
{
oslProcessImpl* pChild;
@@ -499,12 +494,10 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
pArguments = (sal_Char**) malloc( ( nArguments + 2 ) * sizeof(sal_Char*) );
}
-
for ( idx = 0 ; idx < nArguments ; ++idx )
{
rtl_String* strArg =0;
-
rtl_uString2String( &strArg,
rtl_uString_getStr(ustrArguments[idx]),
rtl_uString_getLength(ustrArguments[idx]),
@@ -536,7 +529,6 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
pEnvironment[idx+1]=0;
}
-
Error = osl_psz_executeProcess(szImagePath,
pArguments,
Options,
@@ -728,7 +720,6 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
*
*****************************************************************************/
-
oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process)
{
if (Process == NULL)
@@ -981,7 +972,6 @@ bool osl_getProcStatus(pid_t pid, struct osl_procStat* procstat)
);
}
-
tmp = strstr(prstatusbuf,"Gid:");
if(tmp)
{
@@ -1150,7 +1140,6 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F
return (pInfo->Fields == Fields) ? osl_Process_E_None : osl_Process_E_Unknown;
}
-
/***********************************************
helper function for osl_joinProcessWithTimeout
**********************************************/
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index dab4d99..ed79616 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -52,7 +52,6 @@ extern "C" oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
rtl_uString ** ppFileURL
) SAL_THROW_EXTERN_C();
-
#if defined(MACOSX) || defined(IOS)
#include <mach-o/dyld.h>
@@ -412,7 +411,6 @@ oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString* pustrEnvVar)
return (result);
}
-
/***************************************
osl_getProcessWorkingDir().
**************************************/
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 402bf9c..6e7c38b 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -84,7 +84,6 @@ typedef struct _osl_TProfileSection
osl_TProfileEntry* m_Entries;
} osl_TProfileSection;
-
/* Profile-data structure hidden behind oslProfile: */
typedef struct _osl_TProfileImpl
{
@@ -184,7 +183,6 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
}
#endif
-
if ( ( pFile = openFileImpl(pszProfileName, Flags ) ) == NULL )
{
#ifdef TRACE_OSL_PROFILE
@@ -193,7 +191,6 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
return (NULL);
}
-
pProfile = (osl_TProfileImpl*)calloc(1, sizeof(osl_TProfileImpl));
if ( pProfile == 0 )
@@ -273,7 +270,6 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
pTmpProfile = acquireProfile(Profile,sal_False);
}
-
if ( pTmpProfile == 0 )
{
pthread_mutex_unlock(&(pProfile->m_AccessLock));
@@ -336,7 +332,6 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
return (sal_True);
}
-
sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
{
osl_TProfileImpl* pProfile = (osl_TProfileImpl*) Profile;
@@ -432,7 +427,6 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
return sal_True;
}
-
sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
const sal_Char* pszSection,
const sal_Char* pszEntry,
@@ -509,7 +503,6 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
else
{ /* not implemented */ }
-
bRet=releaseProfile(pProfile);
OSL_ASSERT(bRet);
(void)bRet;
@@ -830,7 +823,6 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
return sal_False;
}
-
pProfile = acquireProfile(Profile, sal_True);
if (pProfile == NULL)
@@ -842,7 +834,6 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
return (sal_False);
}
-
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
{
if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != NULL) &&
@@ -867,7 +858,6 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
else
{ /* not implemented */ }
-
bRet = releaseProfile(pProfile);
OSL_ASSERT(bRet);
@@ -934,7 +924,6 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile,
return (0);
}
-
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
{
if ((pSec = findEntry(pProfile, pszSection, "", &NoEntry)) != NULL)
@@ -1065,7 +1054,6 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile,
else
{ /* not implemented */ }
-
bRet=releaseProfile(pProfile);
OSL_ASSERT(bRet);
(void)bRet;
@@ -1088,7 +1076,6 @@ static osl_TStamp OslProfile_getFileStamp(osl_TFile* pFile)
return (0);
}
-
return (status.st_mtime);
}
@@ -1129,7 +1116,6 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
return (sal_False);
}
-
if ( bLockingDisabled )
{
#ifdef TRACE_OSL_PROFILE
@@ -1138,7 +1124,6 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
return (sal_True);
}
-
lock.l_start = 0;
lock.l_whence = SEEK_SET;
lock.l_len = 0;
@@ -1275,7 +1260,6 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags)
pFile->m_Handle = -1;
}
-
if ( pFile->m_pWriteBuf )
{
free(pFile->m_pWriteBuf);
@@ -1322,7 +1306,6 @@ static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
return bRet;
}
-
static sal_Char* OslProfile_getLine(osl_TFile* pFile)
{
int Max, Free, Bytes, nLineBytes = 0;
@@ -1448,8 +1431,6 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine)
}
}
-
-
memcpy(pFile->m_pWriteBuf + ( pFile->m_nWriteBufLen - pFile->m_nWriteBufFree ),pszLine,Len+1);
#ifdef DEBUG_OSL_PROFILE
strLen = strlen(pFile->m_pWriteBuf);
@@ -1561,7 +1542,6 @@ static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sa
memmove(&pProfile->m_Lines[LineNo + 1], &pProfile->m_Lines[LineNo],
(pProfile->m_NoLines - LineNo) * sizeof(sal_Char *));
-
/* adjust line references */
for (i = 0; i < pProfile->m_NoSections; i++)
{
@@ -1839,7 +1819,6 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
sal_Char* pLine;
sal_Char* bWasAdded = NULL;
-
if ( !pFile )
{
return sal_False;
@@ -2013,7 +1992,6 @@ static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile)
/* open this file */
pFile = openFileImpl(pszTmpName,pProfile->m_Flags | PFlags);
-
/* return new pFile */
return pFile;
}
@@ -2081,7 +2059,6 @@ static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_
return;
}
-
static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
{
osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
@@ -2096,7 +2073,6 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
PFlags = osl_Profile_DEFAULT;
}
-
if (pProfile == NULL)
{
#ifdef DEBUG_OSL_PROFILE
diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx
index 28b32b6..4360965 100644
--- a/sal/osl/unx/security.cxx
+++ b/sal/osl/unx/security.cxx
@@ -155,7 +155,6 @@ oslSecurityError SAL_CALL osl_loginUser(
pszUserName = rtl_string_getStr(strUserName);
}
-
if ( ustrPassword != 0 )
{
rtl_uString2String( &strPassword,
@@ -166,7 +165,6 @@ oslSecurityError SAL_CALL osl_loginUser(
pszPassword = rtl_string_getStr(strPassword);
}
-
Error=osl_psz_loginUser(pszUserName,pszPassword,pSecurity);
if ( strUserName != 0 )
@@ -179,11 +177,9 @@ oslSecurityError SAL_CALL osl_loginUser(
rtl_string_release(strPassword);
}
-
return Error;
}
-
static oslSecurityError SAL_CALL
osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd,
oslSecurity* pSecurity)
@@ -209,7 +205,6 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer(
return osl_Security_E_UserUnknown;
}
-
sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent)
{
sal_Bool bRet=sal_False;
@@ -225,7 +220,6 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent
return bRet;
}
-
sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax)
{
sal_Char buffer[32];
@@ -260,8 +254,6 @@ sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName)
return bRet;
}
-
-
static sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax)
{
oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
@@ -499,7 +491,6 @@ void SAL_CALL osl_freeSecurityHandle(oslSecurity Security)
deleteSecurityImpl(static_cast<oslSecurityImpl *>(Security));
}
-
sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security)
{
(void) Security; /* unused */
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c
index c073a9e..351047d 100644
--- a/sal/osl/unx/signal.c
+++ b/sal/osl/unx/signal.c
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
/* system headers */
#include "system.h"
@@ -609,7 +608,6 @@ static int ReportCrash( int Signal )
pStackTempName = szStackTempNameBuffer;
pChecksumTempName = szChecksumTempNameBuffer;
-
if ( xmlout && stackout && checksumout )
{
fprintf( xmlout, "<errormail:Stack type=\"%s\">\n", STACKTYPE );
@@ -987,7 +985,6 @@ void SignalHandlerFunction(int Signal)
_exit(255);
/* Portal Demo HACK !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-
switch (CallSignalHandler(&Info))
{
case osl_Signal_ActCallNextHdl:
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 1b0e736..acb42ff 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -53,13 +53,11 @@
#define POLLPRI 0x0004
#endif /* HAVE_POLL_H */
-
/* defines for shutdown */
#define SD_RECEIVE 0
#define SD_SEND 1
#define SD_BOTH 2
-
/*
oslSocketAddr is a pointer to a Berkeley struct sockaddr.
I refrained from using sockaddr_in because of possible further
@@ -84,11 +82,9 @@
/* are the same! I don't like it very much but see no other easy way to */
/* conceal the struct sockaddr from the eyes of the user. */
-
#define OSL_INVALID_SOCKET -1
#define OSL_SOCKET_ERROR -1
-
/* Buffer size for gethostbyname */
#define MAX_HOSTBUFFER_SIZE 2048
@@ -155,7 +151,6 @@ static oslProtocol osl_ProtocolFromNative(sal_uInt32 nativeType)
/* macros */
#define PROTOCOL_TO_NATIVE(x) ProtocolMap[x]
-
/*****************************************************************************/
/* enum oslSocketType */
/*****************************************************************************/
@@ -189,7 +184,6 @@ static oslSocketType osl_SocketTypeFromNative(sal_uInt32 nativeType)
#define TYPE_TO_NATIVE(x) TypeMap[x]
#define TYPE_FROM_NATIVE(y) osl_SocketTypeFromNative(y)
-
/*****************************************************************************/
/* enum oslSocketOption */
/*****************************************************************************/
@@ -448,7 +442,6 @@ static sal_uInt32 g_nSocketAddr = 0;
#endif /* OSL_DEBUG_LEVEL */
-
oslSocket __osl_createSocketImpl(int Socket)
{
oslSocket pSocket;
@@ -668,7 +661,6 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr (
pszDottedAddr = rtl_string_getStr(strDottedAddr);
}
-
Addr = osl_psz_createInetSocketAddr(pszDottedAddr, Port);
if ( strDottedAddr != 0 )
@@ -730,7 +722,6 @@ oslSocketResult SAL_CALL osl_getAddrOfSocketAddr( oslSocketAddr pAddr, sal_Seque
return res;
}
-
/** try to figure out a full-qualified hostname, by adding the current domain
as given by the domainname program to the given hostname.
This function MUST NOT call gethostbyname since pHostName already points
@@ -1125,7 +1116,6 @@ oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString *ustrHostname)
pszHostName = rtl_string_getStr(strHostname);
}
-
Addr = osl_psz_resolveHostname(pszHostName);
if ( strHostname != 0 )
@@ -1133,11 +1123,9 @@ oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString *ustrHostname)
rtl_string_release(strHostname);
}
-
return Addr;
}
-
oslSocketAddr SAL_CALL osl_psz_resolveHostname(const sal_Char* pszHostname)
{
struct oslHostAddrImpl *pAddr = (oslHostAddr)osl_psz_createHostAddrByName(pszHostname);
@@ -1194,11 +1182,9 @@ sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString
rtl_string_release(strProtocol);
}
-
return nPort;
}
-
sal_Int32 SAL_CALL osl_psz_getServicePort(const sal_Char* pszServicename,
const sal_Char* pszProtocol)
{
@@ -1271,7 +1257,6 @@ oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uSt
return Result;
}
-
oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr(oslSocketAddr pAddr,
sal_Char *pBuffer, sal_uInt32 BufferSize)
{
@@ -1598,7 +1583,6 @@ oslSocketResult SAL_CALL osl_connectSocketTo(oslSocket pSocket,
return osl_Socket_InProgress;
}
-
pSocket->m_nLastError=errno;
OSL_TRACE("can't connect : '%s'",strerror(errno));
return osl_Socket_Error;
@@ -1632,7 +1616,6 @@ oslSocketResult SAL_CALL osl_connectSocketTo(oslSocket pSocket,
}
}
-
/* prepare select set for socket */
FD_ZERO(&WriteSet);
FD_ZERO(&ExcptSet);
@@ -1700,7 +1683,6 @@ oslSocketResult SAL_CALL osl_connectSocketTo(oslSocket pSocket,
return Result;
}
-
oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
oslSocketAddr* ppAddr)
{
@@ -1732,7 +1714,6 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
Connection = accept(pSocket->m_Socket, &Addr, &AddrLen);
} while (Connection == -1 && errno == EINTR);
-
/* accept failed? */
if( Connection == OSL_SOCKET_ERROR )
{
@@ -1747,7 +1728,6 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
OSL_ASSERT(AddrLen == sizeof(struct sockaddr));
-
#if defined(LINUX)
if ( pSocket->m_bIsInShutdown == sal_True )
{
@@ -1757,7 +1737,6 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
}
#endif /* LINUX */
-
if(ppAddr)
{
*ppAddr= __osl_createSocketAddrFromSystem(&Addr);
@@ -1827,7 +1806,6 @@ sal_Int32 SAL_CALL osl_receiveSocket(oslSocket pSocket,
return nRead;
}
-
sal_Int32 SAL_CALL osl_receiveFromSocket(oslSocket pSocket,
oslSocketAddr pSenderAddr,
void* pBuffer,
@@ -1896,7 +1874,6 @@ sal_Int32 SAL_CALL osl_sendSocket(oslSocket pSocket,
MSG_FLAG_TO_NATIVE(Flag));
} while ( nWritten < 0 && errno == EINTR );
-
if ( nWritten < 0 )
{
pSocket->m_nLastError=errno;
@@ -2179,7 +2156,6 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket pSocket,
return (nRet==0);
}
-
sal_Int32 SAL_CALL osl_getSocketOption(oslSocket pSocket,
oslSocketOptionLevel Level,
oslSocketOption Option,
@@ -2333,7 +2309,6 @@ void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString **
return;
}
-
void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* pBuffer, sal_uInt32 BufferSize)
{
/* make shure pBuffer will be a zero-terminated string even when strncpy has to cut */
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 82ea485..0562289 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -390,5 +390,4 @@ extern int _end[] __attribute__((weak));
static void *dummy[] __attribute__((used)) = {__data_start, data_start, _end};
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index 61b6e39..15a3e43 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "system.h"
#include <osl/diagnose.h>
@@ -52,7 +51,6 @@ typedef struct timeval osl_time_t;
#endif
static osl_time_t startTime;
-
sal_Bool SAL_CALL osl_getSystemTime(TimeValue* tv)
{
#ifdef __MACH__
@@ -89,7 +87,6 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* tv)
return sal_True;
}
-
sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDateTime* pDateTime )
{
struct tm *pSystemTime;
@@ -101,7 +98,6 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDa
/* Convert time from type time_t to struct tm */
pSystemTime = gmtime_r( &atime, &tmBuf );
-
/* Convert struct tm to struct oslDateTime */
if ( pSystemTime != NULL )
{
@@ -186,7 +182,6 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( const oslDateTime* pDateTime, Ti
return sal_False;
}
-
sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( const TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal )
{
struct tm *pLocalTime;
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index 79dbf67..2be2507 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -35,10 +35,8 @@
#include "internal/rtllifecycle.h"
-
// externals
-
extern DWORD g_dwTLSTextEncodingIndex;
extern void SAL_CALL _osl_callThreadKeyCallbackOnThreadDetach(void);
extern CRITICAL_SECTION g_ThreadKeyListCS;
@@ -291,7 +289,6 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
// The corresponding code (setting the environment variable)
// is is desktop/win32/source/officeloader.cxx
-
DWORD dwResult = GetEnvironmentVariable( "ATTACHED_PARENT_PROCESSID", szBuffer, sizeof(szBuffer) );
if ( dwResult && dwResult < sizeof(szBuffer) )
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index dcea2fb..cca3367 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#define UNICODE
#define _UNICODE
#include "systools/win32/uwinapi.h"
@@ -50,7 +49,6 @@
#undef min
#endif
-
// File handle implementation
struct FileHandle_Impl
@@ -651,10 +649,8 @@ oslFileError FileHandle_Impl::syncFile()
return (result);
}
-
// File I/O functions
-
extern "C" oslFileHandle
SAL_CALL osl_createFileHandleFromOSHandle (
HANDLE hFile,
@@ -694,7 +690,6 @@ SAL_CALL osl_createFileHandleFromOSHandle (
return (oslFileHandle)(pImpl);
}
-
oslFileError
SAL_CALL osl_openFile(
rtl_uString * strPath,
@@ -735,7 +730,6 @@ SAL_CALL osl_openFile(
return (result);
}
-
oslFileError
SAL_CALL osl_syncFile(oslFileHandle Handle)
{
@@ -755,7 +749,6 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
return osl_File_E_None;
}
-
oslFileError
SAL_CALL osl_getFileOSHandle(
oslFileHandle Handle,
@@ -771,7 +764,6 @@ SAL_CALL osl_getFileOSHandle(
return osl_File_E_None;
}
-
oslFileError
SAL_CALL osl_closeFile(oslFileHandle Handle)
{
@@ -798,7 +790,6 @@ SAL_CALL osl_closeFile(oslFileHandle Handle)
return (result);
}
-
oslFileError
SAL_CALL osl_mapFile(
oslFileHandle Handle,
@@ -871,7 +862,6 @@ SAL_CALL osl_mapFile(
return osl_File_E_None;
}
-
oslFileError
SAL_CALL osl_unmapFile(void* pAddr, sal_uInt64 /* uLength */)
{
@@ -884,14 +874,12 @@ SAL_CALL osl_unmapFile(void* pAddr, sal_uInt64 /* uLength */)
return osl_File_E_None;
}
-
oslFileError
SAL_CALL osl_unmapMappedFile(oslFileHandle /* Handle */, void* pAddr, sal_uInt64 uLength)
{
return osl_unmapFile( pAddr, uLength );
}
-
oslFileError
SAL_CALL osl_readLine(
oslFileHandle Handle,
@@ -911,7 +899,6 @@ SAL_CALL osl_readLine(
return (result);
}
-
oslFileError
SAL_CALL osl_readFile(
oslFileHandle Handle,
@@ -932,7 +919,6 @@ SAL_CALL osl_readFile(
return (result);
}
-
oslFileError
SAL_CALL osl_writeFile(
oslFileHandle Handle,
@@ -954,7 +940,6 @@ SAL_CALL osl_writeFile(
return (result);
}
-
oslFileError
SAL_CALL osl_readFileAt(
oslFileHandle Handle,
@@ -980,7 +965,6 @@ SAL_CALL osl_readFileAt(
return pImpl->readFileAt (nOffset, pBuffer, uBytesRequested, pBytesRead);
}
-
oslFileError
SAL_CALL osl_writeFileAt(
oslFileHandle Handle,
@@ -1006,7 +990,6 @@ SAL_CALL osl_writeFileAt(
return pImpl->writeFileAt (nOffset, pBuffer, uBytesToWrite, pBytesWritten);
}
-
oslFileError
SAL_CALL osl_isEndOfFile (oslFileHandle Handle, sal_Bool *pIsEOF)
{
@@ -1020,7 +1003,6 @@ SAL_CALL osl_isEndOfFile (oslFileHandle Handle, sal_Bool *pIsEOF)
return osl_File_E_None;
}
-
oslFileError
SAL_CALL osl_getFilePos(oslFileHandle Handle, sal_uInt64 *pPos)
{
@@ -1033,7 +1015,6 @@ SAL_CALL osl_getFilePos(oslFileHandle Handle, sal_uInt64 *pPos)
return osl_File_E_None;
}
-
oslFileError
SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffset)
{
@@ -1077,7 +1058,6 @@ SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffset
return pImpl->setPos (nPos + nOffset);
}
-
oslFileError
SAL_CALL osl_getFileSize (oslFileHandle Handle, sal_uInt64 *pSize)
{
@@ -1091,7 +1071,6 @@ SAL_CALL osl_getFileSize (oslFileHandle Handle, sal_uInt64 *pSize)
return osl_File_E_None;
}
-
oslFileError
SAL_CALL osl_setFileSize (oslFileHandle Handle, sal_uInt64 uSize)
{
@@ -1115,11 +1094,8 @@ SAL_CALL osl_setFileSize (oslFileHandle Handle, sal_uInt64 uSize)
return pImpl->setSize (uSize);
}
-
// File handling functions
-
-
oslFileError SAL_CALL osl_removeFile( rtl_uString* strPath )
{
rtl_uString *strSysPath = NULL;
@@ -1137,7 +1113,6 @@ oslFileError SAL_CALL osl_removeFile( rtl_uString* strPath )
return error;
}
-
oslFileError SAL_CALL osl_copyFile( rtl_uString* strPath, rtl_uString *strDestPath )
{
rtl_uString *strSysPath = NULL, *strSysDestPath = NULL;
@@ -1165,7 +1140,6 @@ oslFileError SAL_CALL osl_copyFile( rtl_uString* strPath, rtl_uString *strDestPa
return error;
}
-
oslFileError SAL_CALL osl_moveFile( rtl_uString* strPath, rtl_uString *strDestPath )
{
rtl_uString *strSysPath = NULL, *strSysDestPath = NULL;
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 2f59872..6fb1009 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -39,12 +39,10 @@
#include <ctype.h>
#endif
-
static const wchar_t UNC_PREFIX[] = L"\\\\";
static const wchar_t BACKSLASH = '\\';
static const wchar_t SLASH = '/';
-
extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime)
{
SYSTEMTIME BaseSysTime;
@@ -77,7 +75,6 @@ extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime
return fSuccess;
}
-
extern "C" BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue *pTimeVal)
{
SYSTEMTIME BaseSysTime;
@@ -108,7 +105,6 @@ extern "C" BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue *pTimeVal
return fSuccess;
}
-
namespace /* private */
{
@@ -125,7 +121,6 @@ namespace /* private */
const sal_Unicode* end_;
};
-
struct UNCComponents
{
Component server_;
@@ -133,15 +128,12 @@ namespace /* private */
Component resource_;
};
-
inline bool is_UNC_path(const sal_Unicode* path)
{ return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast<LPCWSTR>(path), SAL_N_ELEMENTS(UNC_PREFIX) - 1)); }
-
inline bool is_UNC_path(const rtl::OUString& path)
{ return is_UNC_path(path.getStr()); }
-
void parse_UNC_path(const sal_Unicode* path, UNCComponents* puncc)
{
OSL_PRECOND(is_UNC_path(path), "Precondition violated: No UNC path");
@@ -178,12 +170,9 @@ namespace /* private */
"Postcondition violated: Invalid UNC path detected");
}
-
void parse_UNC_path(const rtl::OUString& path, UNCComponents* puncc)
{ parse_UNC_path(path.getStr(), puncc); }
-
-
bool has_path_parent(const sal_Unicode* path)
{
// Has the given path a parent or are we already there,
@@ -203,17 +192,13 @@ namespace /* private */
return has_parent;
}
-
inline bool has_path_parent(const rtl::OUString& path)
{ return has_path_parent(path.getStr()); }
} // end namespace private
-
// volume handling functions
-
-
oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
{
if ( Handle )
@@ -225,7 +210,6 @@ oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handl
return osl_File_E_INVAL;
}
-
oslFileError SAL_CALL osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
{
if ( Handle )
@@ -237,7 +221,6 @@ oslFileError SAL_CALL osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handl
return osl_File_E_INVAL;
}
-
oslFileError SAL_CALL osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uString **pstrPath )
{
if ( Handle && pstrPath )
@@ -249,10 +232,8 @@ oslFileError SAL_CALL osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle
return osl_File_E_INVAL;
}
-
// directory handling functions
-
#define DIRECTORYITEM_DRIVE 0
#define DIRECTORYITEM_FILE 1
#define DIRECTORYITEM_SERVER 2
@@ -269,8 +250,6 @@ struct DirectoryItem_Impl
int nRefCount;
};
-
-
#define DIRECTORYTYPE_LOCALROOT 0
#define DIRECTORYTYPE_NETROOT 1
#define DIRECTORYTYPE_FILESYSTEM 3
@@ -285,8 +264,6 @@ struct Directory_Impl
rtl_uString* m_pDirectoryPath;
};
-
-
typedef struct tagDRIVEENUM
{
LPCTSTR lpIdent;
@@ -294,8 +271,6 @@ typedef struct tagDRIVEENUM
LPCTSTR lpCurrent;
} DRIVEENUM, * PDRIVEENUM, FAR * LPDRIVEENUM;
-
-
static HANDLE WINAPI OpenLogicalDrivesEnum(void)
{
LPDRIVEENUM pEnum = (LPDRIVEENUM)HeapAlloc( GetProcessHeap(), 0, sizeof(DRIVEENUM) );
@@ -317,7 +292,6 @@ static HANDLE WINAPI OpenLogicalDrivesEnum(void)
return pEnum ? (HANDLE)pEnum : INVALID_HANDLE_VALUE;
}
-
static BOOL WINAPI EnumLogicalDrives(HANDLE hEnum, LPTSTR lpBuffer)
{
BOOL fSuccess = FALSE;
@@ -342,7 +316,6 @@ static BOOL WINAPI EnumLogicalDrives(HANDLE hEnum, LPTSTR lpBuffer)
return fSuccess;
}
-
static BOOL WINAPI CloseLogicalDrivesEnum(HANDLE hEnum)
{
BOOL fSuccess = FALSE;
@@ -359,14 +332,12 @@ static BOOL WINAPI CloseLogicalDrivesEnum(HANDLE hEnum)
return fSuccess;
}
-
typedef struct tagDIRECTORY
{
HANDLE hFind;
WIN32_FIND_DATA aFirstData;
} DIRECTORY, *PDIRECTORY, FAR *LPDIRECTORY;
-
static HANDLE WINAPI OpenDirectory( rtl_uString* pPath)
{
LPDIRECTORY pDirectory = NULL;
@@ -413,7 +384,6 @@ static HANDLE WINAPI OpenDirectory( rtl_uString* pPath)
return (HANDLE)pDirectory;
}
-
BOOL WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATA pFindData)
{
BOOL fSuccess = FALSE;
@@ -449,7 +419,6 @@ BOOL WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATA pFindData)
return fSuccess;
}
-
static BOOL WINAPI CloseDirectory(HANDLE hDirectory)
{
BOOL fSuccess = FALSE;
@@ -468,7 +437,6 @@ static BOOL WINAPI CloseDirectory(HANDLE hDirectory)
return fSuccess;
}
-
static oslFileError osl_openLocalRoot(
rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
{
@@ -540,7 +508,6 @@ static oslFileError osl_openLocalRoot(
return error;
}
-
static oslFileError SAL_CALL osl_openFileDirectory(
rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
{
@@ -572,7 +539,6 @@ static oslFileError SAL_CALL osl_openFileDirectory(
rtl_uString_release( pCurDir );
}
-
pDirImpl->uType = DIRECTORYTYPE_FILESYSTEM;
pDirImpl->hDirectory = OpenDirectory( pDirImpl->m_pDirectoryPath );
@@ -593,7 +559,6 @@ static oslFileError SAL_CALL osl_openFileDirectory(
return error;
}
-
static oslFileError SAL_CALL osl_openNetworkServer(
rtl_uString *strSysDirPath, oslDirectory *pDirectory)
{
@@ -625,7 +590,6 @@ static oslFileError SAL_CALL osl_openNetworkServer(
return oslTranslateFileError( dwError );
}
-
static DWORD create_dir_with_callback(
rtl_uString * dir_path,
oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
@@ -652,7 +616,6 @@ static DWORD create_dir_with_callback(
return GetLastError();
}
-
static int path_make_parent(sal_Unicode* path)
{
/* Cut off the last part of the given path to
@@ -671,7 +634,6 @@ static int path_make_parent(sal_Unicode* path)
return (pos_last_backslash - path);
}
-
static DWORD create_dir_recursively_(
rtl_uString * dir_path,
oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
@@ -702,7 +664,6 @@ static DWORD create_dir_recursively_(
return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData);
}
-
oslFileError SAL_CALL osl_createDirectoryPath(
rtl_uString* aDirectoryUrl,
oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
@@ -727,7 +688,6 @@ oslFileError SAL_CALL osl_createDirectoryPath(
sys_path.pData, aDirectoryCreationCallbackFunc, pData));
}
-
oslFileError SAL_CALL osl_createDirectory(rtl_uString* strPath)
{
rtl_uString *strSysPath = NULL;
@@ -765,7 +725,6 @@ oslFileError SAL_CALL osl_createDirectory(rtl_uString* strPath)
return error;
}
-
oslFileError SAL_CALL osl_removeDirectory(rtl_uString* strPath)
{
rtl_uString *strSysPath = NULL;
@@ -783,7 +742,6 @@ oslFileError SAL_CALL osl_removeDirectory(rtl_uString* strPath)
return error;
}
-
oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
{
oslFileError error;
@@ -814,7 +772,6 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirect
return error;
}
-
static oslFileError SAL_CALL osl_getNextNetResource(
oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/ )
{
@@ -860,7 +817,6 @@ static oslFileError SAL_CALL osl_getNextNetResource(
}
}
-
static oslFileError SAL_CALL osl_getNextDrive(
oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/ )
{
@@ -902,7 +858,6 @@ static oslFileError SAL_CALL osl_getNextDrive(
}
}
-
static oslFileError SAL_CALL osl_getNextFileItem(
oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/)
{
@@ -951,7 +906,6 @@ static oslFileError SAL_CALL osl_getNextFileItem(
}
}
-
oslFileError SAL_CALL osl_getNextDirectoryItem(
oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint)
{
@@ -979,7 +933,6 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(
}
}
-
oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory)
{
Directory_Impl *pDirImpl = (Directory_Impl *)Directory;
@@ -1017,7 +970,6 @@ oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory)
return eError;
}
-
/* Different types of paths */
typedef enum _PATHTYPE
{
@@ -1042,7 +994,6 @@ oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirector
*pItem = NULL;
-
error = _osl_getSystemPathFromFileURL( strFilePath, &strSysFilePath, sal_False );
if ( osl_File_E_None != error )
@@ -1157,7 +1108,6 @@ oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirector
return error;
}
-
oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item )
{
DirectoryItem_Impl *pItemImpl = (DirectoryItem_Impl *)Item;
@@ -1169,7 +1119,6 @@ oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item )
return osl_File_E_None;
}
-
oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item )
{
DirectoryItem_Impl *pItemImpl = (DirectoryItem_Impl *)Item;
@@ -1191,7 +1140,6 @@ oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item )
return osl_File_E_None;
}
-
sal_Bool
SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b)
{
@@ -1211,19 +1159,14 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b)
return sal_False;
}
-
// volume / file info handling functions
-
-
static inline bool is_floppy_A_present()
{ return (GetLogicalDrives() & 1); }
-
static inline bool is_floppy_B_present()
{ return (GetLogicalDrives() & 2); }
-
bool is_floppy_volume_mount_point(const rtl::OUString& path)
{
// determines if a volume mount point shows to a floppy
@@ -1251,7 +1194,6 @@ bool is_floppy_volume_mount_point(const rtl::OUString& path)
return false;
}
-
static bool is_floppy_drive(const rtl::OUString& path)
{
static const LPCWSTR FLOPPY_DRV_LETTERS = TEXT("AaBb");
@@ -1266,7 +1208,6 @@ static bool is_floppy_drive(const rtl::OUString& path)
return ((wcschr(FLOPPY_DRV_LETTERS, pszPath[0]) && (L':' == pszPath[1])) || is_floppy_volume_mount_point(path));
}
-
static bool is_volume_mount_point(const rtl::OUString& path)
{
rtl::OUString p(path);
@@ -1297,7 +1238,6 @@ static bool is_volume_mount_point(const rtl::OUString& path)
return is_volume_root;
}
-
static UINT get_volume_mount_point_drive_type(const rtl::OUString& path)
{
if (0 == path.getLength())
@@ -1313,13 +1253,11 @@ static UINT get_volume_mount_point_drive_type(const rtl::OUString& path)
return DRIVE_NO_ROOT_DIR;
}
-
static inline bool is_drivetype_request(sal_uInt32 field_mask)
{
return (field_mask & osl_VolumeInfo_Mask_Attributes);
}
-
static oslFileError osl_get_drive_type(
const rtl::OUString& path, oslVolumeInfo* pInfo)
{
@@ -1366,7 +1304,6 @@ static oslFileError osl_get_drive_type(
return osl_File_E_None;
}
-
static inline bool is_volume_space_info_request(sal_uInt32 field_mask)
{
return (field_mask &
@@ -1375,7 +1312,6 @@ static inline bool is_volume_space_info_request(sal_uInt32 field_mask)
osl_VolumeInfo_Mask_FreeSpace));
}
-
static void get_volume_space_information(
const rtl::OUString& path, oslVolumeInfo *pInfo)
{
@@ -1394,7 +1330,6 @@ static void get_volume_space_information(
}
}
-
static inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
{
return (field_mask &
@@ -1404,7 +1339,6 @@ static inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
osl_VolumeInfo_Mask_FileSystemCaseHandling));
}
-
static oslFileError get_filesystem_attributes(
const rtl::OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
{
@@ -1458,7 +1392,6 @@ static oslFileError get_filesystem_attributes(
return osl_File_E_None;
}
-
static bool path_get_parent(rtl::OUString& path)
{
OSL_PRECOND(path.lastIndexOf(SLASH) == -1, "Path must not have slashes");
@@ -1475,7 +1408,6 @@ static bool path_get_parent(rtl::OUString& path)
return false;
}
-
static void path_travel_to_volume_root(const rtl::OUString& system_path, rtl::OUString& volume_root)
{
rtl::OUString sys_path(system_path);
@@ -1487,7 +1419,6 @@ static void path_travel_to_volume_root(const rtl::OUString& system_path, rtl::OU
osl::systemPathEnsureSeparator(volume_root);
}
-
oslFileError SAL_CALL osl_getVolumeInformation(
rtl_uString *ustrURL, oslVolumeInfo *pInfo, sal_uInt32 uFieldMask )
{
@@ -1522,7 +1453,6 @@ oslFileError SAL_CALL osl_getVolumeInformation(
return osl_File_E_None;
}
-
static oslFileError SAL_CALL osl_getDriveInfo(
oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask)
{
@@ -1621,7 +1551,6 @@ static oslFileError SAL_CALL osl_getDriveInfo(
return osl_File_E_None;
}
-
static oslFileError SAL_CALL osl_getServerInfo(
oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask )
{
@@ -1651,7 +1580,6 @@ static oslFileError SAL_CALL osl_getServerInfo(
return osl_File_E_None;
}
-
oslFileError SAL_CALL osl_getFileStatus(
oslDirectoryItem Item,
oslFileStatus *pStatus,
@@ -1767,11 +1695,8 @@ oslFileError SAL_CALL osl_getFileStatus(
return osl_File_E_None;
}
-
// file attributes handling functions
-
-
oslFileError SAL_CALL osl_setFileAttributes(
rtl_uString *ustrFileURL,
sal_uInt64 uAttributes )
@@ -1812,7 +1737,6 @@ oslFileError SAL_CALL osl_setFileAttributes(
return error;
}
-
oslFileError SAL_CALL osl_setFileTime(
rtl_uString *filePath,
const TimeValue *aCreationTime,
@@ -1830,7 +1754,6 @@ oslFileError SAL_CALL osl_setFileTime(
HANDLE hFile;
BOOL fSuccess;
-
error=_osl_getSystemPathFromFileURL(filePath, &sysPath, sal_False);
if (error==osl_File_E_INVAL)
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index c9a039a..0f35ad4 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -39,15 +39,11 @@
#define WSTR_LONG_PATH_PREFIX L"\\\\?\\"
#define WSTR_LONG_PATH_PREFIX_UNC L"\\\\?\\UNC\\"
-
-
// FileURL functions
-
extern "C" oslMutex g_CurrentDirectoryMutex; /* Initialized in dllentry.c */
oslMutex g_CurrentDirectoryMutex = 0;
-
static BOOL IsValidFilePathComponent(
LPCTSTR lpComponent, LPCTSTR *lppComponentEnd, DWORD dwFlags)
{
@@ -223,7 +219,6 @@ static BOOL IsValidFilePathComponent(
return fValid;
}
-
#define CHARSET_SEPARATOR TEXT("\\/")
DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_uString **corrected)
@@ -297,7 +292,6 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
/* If we now reached the end of the path, everything is O.K. */
-
if ( fValid && (!lpComponent || !*++lpComponent ) )
{
lpComponent = NULL;
@@ -384,7 +378,6 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
return fValid ? dwPathType : PATHTYPE_ERROR;
}
-
static sal_Int32 PathRemoveFileSpec(LPTSTR lpPath, LPTSTR lpFileName, sal_Int32 nFileBufLen )
{
sal_Int32 nRemoved = 0;
@@ -420,7 +413,6 @@ static sal_Int32 PathRemoveFileSpec(LPTSTR lpPath, LPTSTR lpFileName, sal_Int32
return nRemoved;
}
-
// Undocumented in SHELL32.DLL ordinal 32
static LPTSTR PathAddBackslash(LPTSTR lpPath, sal_Int32 nBufLen)
{
@@ -440,7 +432,6 @@ static LPTSTR PathAddBackslash(LPTSTR lpPath, sal_Int32 nBufLen)
return lpEndPath;
}
-
// Same as GetLongPathName but also 95/NT4
static DWORD GetCaseCorrectPathNameEx(
LPTSTR lpszPath, // path buffer to convert
@@ -526,7 +517,6 @@ static DWORD GetCaseCorrectPathNameEx(
return _tcslen( lpszPath );
}
-
DWORD GetCaseCorrectPathName(
LPCTSTR lpszShortPath, // file name
LPTSTR lpszLongPath, // path buffer
@@ -559,8 +549,6 @@ DWORD GetCaseCorrectPathName(
return 0;
}
-
-
static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedURL )
{
sal_Char *pBuffer;
@@ -623,7 +611,6 @@ static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedUR
return bValidEncoded;
}
-
static void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
{
/* Encode non ascii characters within the URL */
@@ -692,8 +679,6 @@ static void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
rtl_freeMemory( pszEncodedURL );
}
-
-
oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **pustrPath, sal_Bool bAllowRelative )
{
rtl_String *strUTF8 = NULL;
@@ -831,7 +816,6 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
return nError;
}
-
oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** pstrURL )
{
oslFileError nError = osl_File_E_INVAL; /* Assume failure */
@@ -937,21 +921,18 @@ oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString**
return nError;
}
-
oslFileError SAL_CALL osl_getFileURLFromSystemPath(
rtl_uString* ustrPath, rtl_uString** pustrURL )
{
return _osl_getFileURLFromSystemPath( ustrPath, pustrURL );
}
-
oslFileError SAL_CALL osl_getSystemPathFromFileURL(
rtl_uString *ustrURL, rtl_uString **pustrPath)
{
return _osl_getSystemPathFromFileURL( ustrURL, pustrPath, sal_True );
}
-
oslFileError SAL_CALL osl_searchFileURL(
rtl_uString *ustrFileName,
rtl_uString *ustrSystemSearchPath,
@@ -1034,8 +1015,6 @@ oslFileError SAL_CALL osl_searchFileURL(
return error;
}
-
-
oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL )
{
oslFileError eError;
@@ -1115,7 +1094,6 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uStr
return eError;
}
-
oslFileError SAL_CALL osl_getCanonicalName( rtl_uString *strRequested, rtl_uString **strValid )
{
rtl_uString_newFromString(strValid, strRequested);
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index d1c0c1d..0fd486c 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -208,8 +208,6 @@ osl_getAsciiFunctionSymbol( oslModule Module, const sal_Char *pSymbol )
return fncAddr;
}
-
-
/*****************************************************************************/
/* osl_addressGetModuleURL */
/*****************************************************************************/
@@ -280,12 +278,10 @@ static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT4( void *pv, rtl_uString **p
SymInitialize_PROC lpfnSymInitialize;
SymCleanup_PROC lpfnSymCleanup;
-
lpfnSymInitialize = (SymInitialize_PROC)GetProcAddress( hModImageHelp, "SymInitialize" );
lpfnSymCleanup = (SymCleanup_PROC)GetProcAddress( hModImageHelp, "SymCleanup" );
lpfnSymGetModuleInfo = (SymGetModuleInfo_PROC)GetProcAddress( hModImageHelp, "SymGetModuleInfo" );
-
if ( lpfnSymInitialize && lpfnSymCleanup && lpfnSymGetModuleInfo )
{
IMAGEHLP_MODULE ModuleInfo;
@@ -344,7 +340,6 @@ static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT4( void *pv, rtl_uString **p
return bSuccess;
}
-
typedef struct _MODULEINFO {
LPVOID lpBaseOfDll;
DWORD SizeOfImage;
@@ -449,5 +444,4 @@ sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress( oslGenericFunction addr,
#endif
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/nlsupport.c b/sal/osl/w32/nlsupport.c
index 175a8c6..3448988 100644
--- a/sal/osl/w32/nlsupport.c
+++ b/sal/osl/w32/nlsupport.c
@@ -33,7 +33,6 @@
#include <osl/process.h>
#include <rtl/tencinfo.h>
-
/* XXX NOTE:
* http://msdn.microsoft.com/en-us/library/windows/desktop/dd373848.aspx
* (retrieved 2013-02-13) has some weird description for the LOCALE_SISO*
@@ -128,7 +127,6 @@ BOOL CALLBACK EnumLocalesProcA( LPSTR lpLocaleStringA )
return TRUE;
}
-
/*****************************************************************************
* GetTextEncodingFromLCID
*****************************************************************************/
@@ -160,7 +158,6 @@ rtl_TextEncoding GetTextEncodingFromLCID( LCID localeId )
return Encoding;
}
-
/*****************************************************************************
* osl_getTextEncodingFromLocale
*****************************************************************************/
@@ -235,5 +232,4 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index c58d70d..14ee0ef 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
/*******************************************************************
Includes
******************************************************************/
@@ -105,5 +104,4 @@ sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPat
return 0;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/pipe.c b/sal/osl/w32/pipe.c
index 149de07..40fdde6 100644
--- a/sal/osl/w32/pipe.c
+++ b/sal/osl/w32/pipe.c
@@ -60,7 +60,6 @@ struct oslPipeImpl {
sal_Bool m_bClosed;
};
-
/*****************************************************************************/
/* osl_create/destroy-PipeImpl */
/*****************************************************************************/
@@ -108,8 +107,6 @@ void __osl_destroyPipeImpl(oslPipe pPipe)
}
}
-
-
/*****************************************************************************/
/* osl_createPipe */
/*****************************************************************************/
@@ -490,7 +487,6 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
return BytesRead;
}
-
/*****************************************************************************/
/* osl_getLastPipeError */
/*****************************************************************************/
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 0328a4f..830e411 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -53,7 +53,6 @@ oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process)
if (TerminateProcess(((oslProcessImpl*)Process)->m_hProcess, 0))
return osl_Process_E_None;
-
return osl_Process_E_Unknown;
}
@@ -452,7 +451,6 @@ oslProcessError SAL_CALL osl_getProcessWorkingDir( rtl_uString **pustrWorkingDir
::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH );
DWORD dwLen = 0;
-
osl_acquireMutex( g_CurrentDirectoryMutex );
dwLen = GetCurrentDirectory( aBuffer.getBufSizeInSymbols(), ::osl::mingw_reinterpret_cast<LPWSTR>(aBuffer) );
osl_releaseMutex( g_CurrentDirectoryMutex );
@@ -601,7 +599,6 @@ sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe hPipe, oslSocket pSocket)
return(bRet);
}
-
oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
{
sal_Bool bRet = sal_False;
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 2b83d0c..9f511e7 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#define UNICODE
#define _UNICODE
@@ -46,10 +45,8 @@
#include <string>
#include <string.h>
-
extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle( HANDLE hFile, sal_uInt32 uFlags );
-
const sal_Unicode NAME_VALUE_SEPARATOR = TEXT('=');
const sal_Char* SPACE = " ";
const rtl::OUString ENV_COMSPEC ("COMSPEC");
@@ -64,7 +61,6 @@ namespace /* private */
typedef std::pair<string_container_iterator_t, string_container_iterator_t> iterator_pair_t;
typedef std::vector<sal_Unicode> environment_container_t;
-
/* Function object that compares two strings that are
expected to be environment variables in the form
"name=value". Only the 'name' part will be compared.
@@ -90,7 +86,6 @@ namespace /* private */
}
};
-
/* Function object used by for_each algorithm to
calculate the sum of the length of all strings
in a string container. */
@@ -100,7 +95,6 @@ namespace /* private */
sum_of_string_lengths() : sum_(0) {}
-
void operator() (const rtl::OUString& string)
{
OSL_ASSERT(string.getLength());
@@ -110,7 +104,6 @@ namespace /* private */
sum_ += string.getLength() + 1;
}
-
operator size_t () const
{
return sum_;
@@ -119,14 +112,12 @@ namespace /* private */
size_t sum_;
};
-
inline size_t calc_sum_of_string_lengths(const string_container_t& string_cont)
{
return std::for_each(
string_cont.begin(), string_cont.end(), sum_of_string_lengths());
}
-
void read_environment(/*out*/ string_container_t* environment)
{
// GetEnvironmentStrings returns a sorted list, Windows
@@ -142,7 +133,6 @@ namespace /* private */
FreeEnvironmentStrings(env);
}
-
/* the environment list must be sorted, new values
should either replace existing ones or should be
added to the list, environment variables will
@@ -184,7 +174,6 @@ namespace /* private */
return true;
}
-
/* Create a merged environment */
bool setup_process_environment(
rtl_uString* environment_vars[],
@@ -221,7 +210,6 @@ namespace /* private */
return true;
}
-
/* In contrast to the Win32 API function CreatePipe with
this function the caller is able to determine separately
which handle of the pipe is inheritable. */
@@ -274,7 +262,6 @@ namespace /* private */
return bRet;
}
-
// Add a quote sign to the start and the end of a string
// if not already present
rtl::OUString quote_string(const rtl::OUString& string)
@@ -358,7 +345,6 @@ namespace /* private */
return exe_path;
}
-
rtl::OUString get_file_extension(const rtl::OUString& file_name)
{
sal_Int32 index = file_name.lastIndexOf('.');
@@ -368,7 +354,6 @@ namespace /* private */
return rtl::OUString();
}
-
bool is_batch_file(const rtl::OUString& file_name)
{
rtl::OUString ext = get_file_extension(file_name);
@@ -377,7 +362,6 @@ namespace /* private */
ext.equalsIgnoreAsciiCase("btm"));
}
-
rtl::OUString get_batch_processor()
{
rtl::OUString comspec;
@@ -394,8 +378,6 @@ namespace /* private */
} // namespace private
-
-
oslProcessError SAL_CALL osl_executeProcess(
rtl_uString *strImageName,
rtl_uString *strArguments[],
@@ -421,7 +403,6 @@ oslProcessError SAL_CALL osl_executeProcess(
NULL, NULL, NULL );
}
-
oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
rtl_uString *ustrImageName,
rtl_uString *ustrArguments[],
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 571e47a..112b70e 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -40,7 +40,6 @@ static inline void copy_ustr_n( void *dest, const void *source, size_t length )
#define ENTRIES_INI 5
#define ENTRIES_ADD 3
-
#define STR_INI_EXTENSION L".ini"
#define STR_INI_METAHOME "?~"
#define STR_INI_METASYS "?$"
@@ -71,7 +70,6 @@ static inline void copy_ustr_n( void *dest, const void *source, size_t length )
/*#define DEBUG_OSL_PROFILE 1*/
/*#define TRACE_OSL_PROFILE 1*/
-
/*****************************************************************************/
/* Data Type Definition */
/*****************************************************************************/
@@ -110,7 +108,6 @@ typedef struct _osl_TProfileSection
osl_TProfileEntry* m_Entries;
} osl_TProfileSection;
-
/*
Profile-data structure hidden behind oslProfile:
*/
@@ -128,7 +125,6 @@ typedef struct _osl_TProfileImpl
osl_TProfileSection* m_Sections;
} osl_TProfileImpl;
-
/*****************************************************************************/
/* Static Module Function Declarations */
/*****************************************************************************/
@@ -192,10 +188,8 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
rtl_uString_assign(&FileName, strProfileName);
}
-
osl_getSystemPathFromFileURL(FileName, &FileName);
-
#ifdef DEBUG_OSL_PROFILE
Flags=osl_Profile_FLUSHWRITE;
@@ -232,10 +226,8 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
return (NULL);
}
-
pProfile = (osl_TProfileImpl*)calloc(1, sizeof(osl_TProfileImpl));
-
pProfile->m_Flags = Flags & FLG_USER;
osl_getSystemPathFromFileURL(strProfileName, &pProfile->m_strFileName);
@@ -340,7 +332,6 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
return (sal_True);
}
-
sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
{
osl_TProfileImpl* pProfile = (osl_TProfileImpl*) Profile;
@@ -420,7 +411,6 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
return sal_True;
}
-
sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
const sal_Char* pszSection, const sal_Char* pszEntry,
sal_Char* pszString, sal_uInt32 MaxLen,
@@ -431,7 +421,6 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
osl_TProfileSection* pSec;
osl_TProfileImpl* pProfile = 0;
-
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In osl_readProfileString");
#endif
@@ -447,7 +436,6 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
return (sal_False);
}
-
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
{
if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != NULL) &&
@@ -493,7 +481,6 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
return (sal_True);
}
-
sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
const sal_Char* pszSection, const sal_Char* pszEntry,
sal_Bool Default)
@@ -524,7 +511,6 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
return (Default);
}
-
sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
const sal_Char* pszSection, const sal_Char* pszEntry,
sal_uInt32 FirstId, const sal_Char* Strings[],
@@ -583,7 +569,6 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
return (sal_False);
}
-
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
{
if ((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) == NULL)
@@ -659,7 +644,6 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
return bRet;
}
-
sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
const sal_Char* pszSection, const sal_Char* pszEntry,
sal_Bool Value)
@@ -682,7 +666,6 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
return bRet;
}
-
sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
const sal_Char* pszSection, const sal_Char* pszEntry,
sal_uInt32 FirstId, const sal_Char* Strings[],
@@ -708,7 +691,6 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
return bRet;
}
-
sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
const sal_Char *pszSection, const sal_Char *pszEntry)
{
@@ -729,11 +711,9 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]");
#endif
-
return (sal_False);
}
-
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
{
if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != NULL) &&
@@ -770,7 +750,6 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
return bRet;
}
-
sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_Char *pszSection,
sal_Char* pszBuffer, sal_uInt32 MaxLen)
{
@@ -791,11 +770,9 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]");
#endif
-
return (0);
}
-
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
{
if ((pSec = findEntry(pProfile, pszSection, "", &NoEntry)) != NULL)
@@ -846,7 +823,6 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
return (n);
}
-
sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName)
{
sal_Bool bFailed;
@@ -1062,7 +1038,6 @@ sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName,
return (sal_Bool) (nError == osl_File_E_None);
}
-
sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuffer, sal_uInt32 MaxLen)
{
sal_uInt32 i, n = 0;
@@ -1114,7 +1089,6 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
return (n);
}
-
/*****************************************************************************/
/* Static Module Functions */
/*****************************************************************************/
@@ -1130,8 +1104,6 @@ static osl_TStamp getFileStamp(osl_TFile* pFile)
return (FileTime);
}
-
-
static sal_Bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
{
sal_Bool status = sal_False;
@@ -1164,7 +1136,6 @@ static sal_Bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
return (status);
}
-
static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption ProfileFlags )
{
osl_TFile* pFile = reinterpret_cast< osl_TFile*>( calloc( 1, sizeof(osl_TFile) ) );
@@ -1219,8 +1190,6 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi
return (pFile);
}
-
-
static osl_TStamp closeFileImpl(osl_TFile* pFile)
{
osl_TStamp stamp = {0, 0};
@@ -1250,7 +1219,6 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile)
return(stamp);
}
-
static sal_Bool rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
{
if (pFile->m_Handle != INVALID_HANDLE_VALUE)
@@ -1266,7 +1234,6 @@ static sal_Bool rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
return (sal_True);
}
-
static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen)
{
DWORD Max;
@@ -1346,7 +1313,6 @@ static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen)
return (sal_True);
}
-
static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine)
{
unsigned int Len = strlen(pszLine);
@@ -1380,8 +1346,6 @@ static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine)
}
}
-
-
memcpy(pFile->m_pWriteBuf + ( pFile->m_nWriteBufLen - pFile->m_nWriteBufFree ),pszLine,Len+1);
pFile->m_pWriteBuf[pFile->m_nWriteBufLen - pFile->m_nWriteBufFree + Len]='\r';
@@ -1496,7 +1460,6 @@ static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Li
memmove(&pProfile->m_Lines[LineNo + 1], &pProfile->m_Lines[LineNo],
(pProfile->m_NoLines - LineNo) * sizeof(sal_Char *));
-
/* adjust line references */
for (i = 0; i < pProfile->m_NoSections; i++)
{
@@ -1815,7 +1778,6 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
return (sal_True);
}
-
static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
{
#ifdef TRACE_OSL_PROFILE
@@ -1896,7 +1858,6 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
return (sal_True);
}
-
static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile)
{
osl_TFile* pFile=0;
@@ -1906,7 +1867,6 @@ static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile)
rtl_uString_newFromAscii(&ustrExtension,"tmp");
-
/* generate tmp profilename */
ustrTmpName=osl_ProfileGenerateExtension(pProfile->m_strFileName,ustrExtension);
rtl_uString_release(ustrExtension);
@@ -1916,7 +1876,6 @@ static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile)
return 0;
}
-
if ( ! ( pProfile->m_Flags & osl_Profile_READLOCK ) )
{
PFlags |= osl_Profile_WRITELOCK;
@@ -1925,12 +1884,10 @@ static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile)
/* open this file */
pFile = openFileImpl(ustrTmpName,pProfile->m_Flags | PFlags);
-
/* return new pFile */
return pFile;
}
-
static sal_Bool osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
{
sal_Bool bRet = sal_False;
@@ -1940,28 +1897,24 @@ static sal_Bool osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
rtl_uString* ustrIniFile=0;
rtl_uString* ustrExtension=0;
-
rtl_uString_newFromAscii(&ustrExtension,"bak");
ustrBakFile=osl_ProfileGenerateExtension(pProfile->m_strFileName,ustrExtension);
rtl_uString_release(ustrExtension);
ustrExtension=0;
-
rtl_uString_newFromAscii(&ustrExtension,"ini");
ustrIniFile=osl_ProfileGenerateExtension(pProfile->m_strFileName,ustrExtension);
rtl_uString_release(ustrExtension);
ustrExtension=0;
-
rtl_uString_newFromAscii(&ustrExtension,"tmp");
ustrTmpFile=osl_ProfileGenerateExtension(pProfile->m_strFileName,ustrExtension);
rtl_uString_release(ustrExtension);
ustrExtension=0;
-
/* unlink bak */
DeleteFileW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( ustrBakFile )) );
@@ -1974,7 +1927,6 @@ static sal_Bool osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
return bRet;
}
-
static rtl_uString* osl_ProfileGenerateExtension(rtl_uString* ustrFileName, rtl_uString* ustrExtension)
{
rtl_uString* ustrNewFileName=0;
@@ -2000,13 +1952,11 @@ static rtl_uString* osl_ProfileGenerateExtension(rtl_uString* ustrFileName, rtl_
return ustrNewFileName;
}
-
static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
{
osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
oslProfileOption PFlags=0;
-
if ( bWriteable )
{
PFlags = osl_Profile_DEFAULT | osl_Profile_WRITELOCK;
@@ -2016,7 +1966,6 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
PFlags = osl_Profile_DEFAULT;
}
-
if (pProfile == NULL)
{
#ifdef DEBUG_OSL_PROFILE
@@ -2034,8 +1983,6 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
OSL_TRACE("try to acquire");
#endif
-
-
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
{
if (! (pProfile->m_Flags & (osl_Profile_READLOCK |
@@ -2065,7 +2012,6 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
OSL_TRACE("READ/WRITELOCK MODE");
#endif
-
/* A readlock file could not be written */
if ((pProfile->m_Flags & osl_Profile_READLOCK) && bWriteable)
{
@@ -2305,7 +2251,6 @@ static sal_Bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *str
}
}
-
if (dwPathLen == 0)
{
rtl_uString * strExecutable = NULL;
@@ -2528,5 +2473,4 @@ static sal_Bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *str
return sal_True;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx
index 3eb9290..04fab27 100644
--- a/sal/osl/w32/salinit.cxx
+++ b/sal/osl/w32/salinit.cxx
@@ -122,8 +122,6 @@ void sal_detail_deinitialize()
}
}
-
-
#ifdef __cplusplus
} // extern "C"
#endif
diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index 84d01bb..d4d7d12 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "system.h"
#include <osl/security.h>
@@ -32,7 +31,6 @@
/* Data Type Definition */
/*****************************************************************************/
-
/* Data for use in (un)LoadProfile Functions */
/* Declarations based on USERENV.H for Windows 2000 Beta 2 */
#define PI_NOUI 0x00000001 // Prevents displaying of messages
@@ -201,7 +199,6 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer(rtl_uString *strUserName,
return ret;
}
-
static BOOL WINAPI CheckTokenMembership_Stub( HANDLE TokenHandle, PSID SidToCheck, PBOOL IsMember )
{
typedef BOOL (WINAPI *CheckTokenMembership_PROC)( HANDLE, PSID, PBOOL );
@@ -228,7 +225,6 @@ static BOOL WINAPI CheckTokenMembership_Stub( HANDLE TokenHandle, PSID SidToChec
}
-
sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security)
{
if (Security != NULL)
@@ -238,7 +234,6 @@ sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security)
SID_IDENTIFIER_AUTHORITY siaNtAuthority = { SECURITY_NT_AUTHORITY };
sal_Bool bSuccess = sal_False;
-
/* If Security contains an access token we need to duplicate it to an impersonation
access token. NULL works with CheckTokenMembership() as the current effective
impersonation token
@@ -280,7 +275,6 @@ sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security)
return (sal_False);
}
-
void SAL_CALL osl_freeSecurityHandle(oslSecurity Security)
{
if (Security)
@@ -305,7 +299,6 @@ void SAL_CALL osl_freeSecurityHandle(oslSecurity Security)
}
}
-
sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent)
{
if (Security != NULL)
@@ -323,7 +316,6 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent)
DWORD nInfoBuffer = 512;
UCHAR* pInfoBuffer = malloc(nInfoBuffer);
-
while (!GetTokenInformation(hAccessToken, TokenUser,
pInfoBuffer, nInfoBuffer, &nInfoBuffer))
{
@@ -429,14 +421,11 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent)
return sal_False;
}
-
-
sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **strName)
{
return getUserNameImpl(Security, strName, sal_True);
}
-
sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirectory)
{
rtl_uString *ustrSysDir = NULL;
@@ -513,7 +502,6 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire
return bSuccess;
}
-
sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security)
{
/* CreateProcessAsUser does not load the specified user's profile
@@ -587,7 +575,6 @@ sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security)
return (sal_Bool)bOk;
}
-
void SAL_CALL osl_unloadUserProfile(oslSecurity Security)
{
if ( ((oslSecurityImpl*)Security)->m_hProfile != NULL )
@@ -641,7 +628,6 @@ void SAL_CALL osl_unloadUserProfile(oslSecurity Security)
/* Static Module Functions */
/*****************************************************************************/
-
static sal_Bool GetSpecialFolder(rtl_uString **strPath, int nFolder)
{
sal_Bool bRet = sal_False;
@@ -681,7 +667,6 @@ static sal_Bool GetSpecialFolder(rtl_uString **strPath, int nFolder)
BOOL (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST, LPWSTR) = (BOOL (WINAPI *)(LPCITEMIDLIST, LPWSTR))GetProcAddress(hLibrary, "SHGetPathFromIDListW");
HRESULT (WINAPI *pSHGetMalloc)(LPMALLOC *) = (HRESULT (WINAPI *)(LPMALLOC *))GetProcAddress(hLibrary, "SHGetMalloc");
-
if (pSHGetSpecialFolderLocation && (pSHGetPathFromIDListA || pSHGetPathFromIDListW ) && pSHGetMalloc )
{
LPITEMIDLIST pidl;
@@ -767,7 +752,6 @@ static sal_Bool GetSpecialFolder(rtl_uString **strPath, int nFolder)
return (bRet);
}
-
static BOOL Privilege(LPTSTR strPrivilege, BOOL bEnable)
{
HANDLE hToken;
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index a63e692..6feec0c 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -177,7 +177,6 @@ static BOOL ReportCrash( LPEXCEPTION_POINTERS lpEP )
ZeroMemory( &StartupInfo, sizeof(StartupInfo) );
StartupInfo.cb = sizeof(StartupInfo.cb);
-
sntprintf( szBuffer, SAL_N_ELEMENTS(szBuffer),
_T("%s -p %lu -excp 0x%p -t %lu%s"),
static_cast<sal_Char*>( aPath ),
@@ -277,7 +276,6 @@ static long WINAPI SignalHandlerFunction(LPEXCEPTION_POINTERS lpEP)
else
Action = osl_Signal_ActKillApp;
-
switch ( Action )
{
case osl_Signal_ActCallNextHdl:
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 2b7e742..881c467 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "system.h"
#include <osl/socket.h>
@@ -1338,7 +1337,6 @@ oslSocketResult SAL_CALL osl_connectSocketTo (
else /* timeout */
Result= osl_Socket_TimedOut;
-
/* clean up */
Param= 0;
ioctlsocket(pSocket->m_Socket, FIONBIO, &Param);
@@ -1571,7 +1569,6 @@ sal_Int32 SAL_CALL osl_writeSocket( oslSocket pSocket, const void *pBuffer, sal_
return BytesSend;
}
-
/*****************************************************************************/
/* osl_isReceiveReady */
/*****************************************************************************/
diff --git a/sal/osl/w32/sockimpl.h b/sal/osl/w32/sockimpl.h
index 2b5ebeb..df56bdb 100644
--- a/sal/osl/w32/sockimpl.h
+++ b/sal/osl/w32/sockimpl.h
@@ -86,5 +86,4 @@ typedef struct osl_socket_dialup_impl_st
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
index 422ad27..8c7e9d7 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -32,7 +32,6 @@
#include <malloc.h>
#include <tchar.h>
-
// Allocate n number of t's on the stack return a pointer to it in p
#ifdef __MINGW32__
#define STACK_ALLOC(p, t, n) (p) = reinterpret_cast<t*>(_alloca((n)*sizeof(t)));
@@ -43,10 +42,8 @@
extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle(HANDLE hFile, sal_uInt32 uFlags);
-
// Temp file functions
-
static oslFileError osl_setup_base_directory_impl_(
rtl_uString* pustrDirectoryURL,
rtl_uString** ppustr_base_dir)
@@ -75,7 +72,6 @@ static oslFileError osl_setup_base_directory_impl_(
return error;
}
-
static oslFileError osl_setup_createTempFile_impl_(
rtl_uString* pustrDirectoryURL,
oslFileHandle* pHandle,
@@ -102,7 +98,6 @@ static oslFileError osl_setup_createTempFile_impl_(
return osl_error;
}
-
static oslFileError osl_win32_GetTempFileName_impl_(
rtl_uString* base_directory, LPWSTR temp_file_name)
{
@@ -120,7 +115,6 @@ static oslFileError osl_win32_GetTempFileName_impl_(
return osl_error;
}
-
static sal_Bool osl_win32_CreateFile_impl_(
LPCWSTR file_name, sal_Bool b_delete_on_close, oslFileHandle* p_handle)
{
@@ -148,7 +142,6 @@ static sal_Bool osl_win32_CreateFile_impl_(
return (sal_Bool)IsValidHandle(hFile);
}
-
static oslFileError osl_createTempFile_impl_(
rtl_uString* base_directory,
LPWSTR tmp_name,
@@ -181,7 +174,6 @@ static oslFileError osl_createTempFile_impl_(
return osl_error;
}
-
oslFileError SAL_CALL osl_createTempFile(
rtl_uString* pustrDirectoryURL,
oslFileHandle* pHandle,
@@ -225,7 +217,6 @@ oslFileError SAL_CALL osl_createTempFile(
return osl_error;
}
-
oslFileError SAL_CALL osl_getTempDirURL(rtl_uString** pustrTempDir)
{
::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH );
diff --git a/sal/osl/w32/thread.c b/sal/osl/w32/thread.c
index a5cf715..2eeea06 100644
--- a/sal/osl/w32/thread.c
+++ b/sal/osl/w32/thread.c
@@ -188,7 +188,6 @@ void SAL_CALL osl_setThreadPriority(oslThread Thread,
OSL_ASSERT(pThreadImpl); /* valid ptr? */
-
/* map enum to WIN32 levels
it would be faster and more elegant to preset
the enums, but that would require an #ifdef in
@@ -251,7 +250,6 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const oslThread Thread)
winPriority=
GetThreadPriority(pThreadImpl->m_hThread);
-
if(winPriority == THREAD_PRIORITY_ERROR_RETURN)
{
return osl_Thread_PriorityUnknown;
@@ -355,7 +353,6 @@ void SAL_CALL osl_terminateThread(oslThread Thread)
osl_atomic_increment(&(pThreadImpl->m_nTerminationRequested));
}
-
/*****************************************************************************/
/* osl_scheduleThread */
/*****************************************************************************/
@@ -459,7 +456,6 @@ void SAL_CALL _osl_callThreadKeyCallbackOnThreadDetach(void)
{
PTLS pTls;
-
EnterCriticalSection( &g_ThreadKeyListCS );
pTls = g_pThreadKeyList;
while ( pTls )
@@ -554,14 +550,12 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData)
return (sal_False);
}
-
/*****************************************************************************/
/* osl_getThreadTextEncoding */
/*****************************************************************************/
DWORD g_dwTLSTextEncodingIndex = (DWORD)-1;
-
rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding(void)
{
DWORD_PTR dwEncoding;
@@ -596,6 +590,4 @@ rtl_TextEncoding SAL_CALL osl_setThreadTextEncoding( rtl_TextEncoding Encoding )
return oldEncoding;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/time.c b/sal/osl/w32/time.c
index 4e66aae..dd30c44 100644
--- a/sal/osl/w32/time.c
+++ b/sal/osl/w32/time.c
@@ -27,10 +27,8 @@ extern sal_Bool TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime
extern BOOL FileTimeToTimeValue( const FILETIME *cpFTime, TimeValue *pTimeVal );
-
// osl_getSystemTime
-
sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal)
{
SYSTEMTIME SystemTime;
@@ -61,10 +59,8 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal)
return (sal_True);
}
-
// osl_getDateTimeFromTimeValue
-
sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDateTime* pDateTime )
{
FILETIME aFileTime;
@@ -91,10 +87,8 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDa
return sal_False;
}
-
// osl_getTimeValueFromDateTime
-
sal_Bool SAL_CALL osl_getTimeValueFromDateTime( const oslDateTime* pDateTime, TimeValue* pTimeVal )
{
FILETIME aFileTime;
@@ -121,11 +115,8 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( const oslDateTime* pDateTime, Ti
return sal_False;
}
-
-
// osl_getLocalTimeFromSystemTime
-
sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( const TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal )
{
TIME_ZONE_INFORMATION aTimeZoneInformation;
@@ -153,10 +144,8 @@ sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( const TimeValue* pSystemTimeVa
return sal_False;
}
-
// osl_getSystemTimeFromLocalTime
-
sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( const TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal )
{
TIME_ZONE_INFORMATION aTimeZoneInformation;
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index dabfb3a..7491bcf 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -34,10 +34,8 @@ using ::rtl::OString;
// This file contains cppunit tests for the
// OString and OStringBuffer classes
-
// testing constructors
-
namespace rtl_OStringBuffer
{
class ctors : public CppUnit::TestFixture
@@ -166,8 +164,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
-
class makeStringAndClear : public CppUnit::TestFixture
{
OString* arrOUS[6];
@@ -325,7 +321,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
class remove : public CppUnit::TestFixture
{
public:
@@ -371,9 +366,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
-
-
class getLength : public CppUnit::TestFixture
{
OString* arrOUS[6];
@@ -505,8 +497,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
-
class getCapacity : public CppUnit::TestFixture
{
OString* arrOUS[6];
@@ -690,7 +680,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
class ensureCapacity : public CppUnit::TestFixture
{
void ensureCapacity_001()
@@ -969,8 +958,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
-
class setLength : public CppUnit::TestFixture
{
OString* arrOUS[6];
@@ -1459,8 +1446,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
-
class csuc : public CppUnit::TestFixture
{
void csuc_001()
@@ -1505,8 +1490,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
-
class getStr : public CppUnit::TestFixture
{
void getStr_001()
@@ -1551,8 +1534,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
-
class append_001 : public CppUnit::TestFixture
{
OString* arrOUS[5];
@@ -1960,8 +1941,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
-
class append_002 : public CppUnit::TestFixture
{
OString* arrOUS[5];
@@ -2348,7 +2327,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
class append_003 : public CppUnit::TestFixture
{
OString* arrOUS[5];
@@ -2734,7 +2712,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
class append_004 : public CppUnit::TestFixture
{
OString* arrOUS[5];
@@ -14031,7 +14008,6 @@ namespace rtl_OStringBuffer
aStrBuf.append( intVal, -5 );
-
CPPUNIT_ASSERT_MESSAGE
(
"Appends the WrongRadix to the string buffer arrOUS[0]",
@@ -16179,7 +16155,6 @@ namespace rtl_OStringBuffer
// testing the method append( double d )
-
class checkdouble : public CppUnit::TestFixture
{
public:
@@ -16257,7 +16232,6 @@ namespace rtl_OStringBuffer
CPPUNIT_TEST_SUITE_END();
};
-
// testing the method append( double f ) for negative value
class append_009_Double_Negative : public checkdouble
@@ -16320,7 +16294,6 @@ namespace rtl_OStringBuffer
};
} // namespace rtl_OStringBuffer
-
CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::ctors);
CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::makeStringAndClear);
CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::getLength);
diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index 19e25c1..c0c647e 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -294,8 +294,6 @@ static const sal_Int32 kSInt32Max = INT_MAX;
static const sal_Int64 kUInt32Max = UINT_MAX;
static const sal_Int64 kSInt64Max = SAL_CONST_INT64(9223372036854775807);
-
-
static const sal_Int32 kInt32MaxNumsCount = 5;
static const sal_Int32 kInt32MaxNums[kInt32MaxNumsCount] =
@@ -319,26 +317,18 @@ static const sal_Int32 kBinaryNumsCount = 16;
static const sal_Int32 kBinaryMaxNumsCount = 7;
-
-
static const sal_Int32 kOctolNumsCount = 16;
static const sal_Int32 kOctolMaxNumsCount = 7;
-
-
static const sal_Int32 kDecimalNumsCount = 16;
static const sal_Int32 kDecimalMaxNumsCount = 7;
-
-
static const sal_Int32 kHexDecimalNumsCount = 16;
static const sal_Int32 kHexDecimalMaxNumsCount = 7;
-
-
static const sal_Int32 kBase36NumsCount = 36;
static const sal_Int32 kBase36MaxNumsCount = 7;
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index 592935f..0440466 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -77,7 +77,6 @@ sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt )
return ( dst );
}
-
bool cmpstr( const sal_Char* str1, const sal_Char* str2, sal_uInt32 len )
{
const sal_Char* pBuf1 = str1;
@@ -126,7 +125,6 @@ bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 len )
return( i == len );
}
-
bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 )
{
const sal_Unicode* pBuf1 = str1;
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
index 276e3a2..3a674a8 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
@@ -39,17 +39,12 @@ bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 );
sal_Char* createName( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt );
-
sal_uInt32 AStringLen( const sal_Char *pAStr );
-
-
bool AStringNIsValid( const sal_Char *pAStr,
const sal_uInt32 nStrLen
);
-
-
sal_Int32 AStringToUStringCompare( const sal_Unicode *pUStr,
const sal_Char *pAStr
);
@@ -64,9 +59,4 @@ sal_Int32 AStringToUStringNCompare( const sal_Unicode *pUStr,
#endif /* _RTL_STRING_UTILS_HXX */
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
index e855199..301c8a9 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
@@ -42,6 +42,4 @@ static const sal_Int32 kErrCompareNAStringToString = -9;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list