From 335cd830b0bd430d282687df58a91a69dac2c528 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 3 Apr 2014 10:00:55 +0300 Subject: Kill superfluous vertical whitespace Change-Id: I8c37b9ec45836f9c0e2dc0cf232f96f23c7c36d3 --- 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 - .../clipboardwben/testcopy/XTDataObject.cxx | 57 ----- .../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(-) (limited to 'sal') diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c index c43d3ba433bf..49f9b3aa627c 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 73cc36a33418..f31edaaa3c7b 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 b82eb8cbad14..081b95859913 100644 --- a/sal/cpprt/operators_new_delete.cxx +++ b/sal/cpprt/operators_new_delete.cxx @@ -23,10 +23,8 @@ #include #include - // 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 75cd8466f9d4..57f70d8c9bc8 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 1fc0e74315d3..5390c9af8c35 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 2e77690ebf13..a3dc71efe50b 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 diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx index adafdbbdc4f4..20ae1a41f695 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 3b50cdccccb8..1b664d69995b 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 @@ -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 #include @@ -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 04e39538323c..c7fb99289850 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 ddf483a97fb5..36fd44abd346 100644 --- a/sal/osl/unx/conditn.cxx +++ b/sal/osl/unx/conditn.cxx @@ -28,7 +28,6 @@ #include #include - 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 59700b995b27..42077466fe9e 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 f2619746048b..7033e38d744a 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 695b89d38c79..f238f28af50f 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 4a2106200386..a2b4607ba5ab 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 - 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 5d6bd109482d..6c5f6a662bb3 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 f3e0e9c58576..c189a8b6934a 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 0473b9fd879a..ce036fcfa9db 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 @@ -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 cd8b5d2125db..b2862df42db9 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 diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx index 3020571b2a91..1ebdfaced8c8 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 a2a6df7abcc0..a8eb99dd7fed 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 ac5ef1852449..943aa368b813 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 969c467dcaaa..761897097aab 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 #include diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c index 79e847e90bfb..b1263c8d09f3 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 a98e48a41186..abe4bc9f6b64 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 #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 dab4d9942433..ed79616641e7 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 @@ -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 402bf9cfc7fd..6e7c38bb7311 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 28b32b6106c7..4360965a15e1 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(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 c073a9e5da2c..351047d9ad34 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, "\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 1b0e7367d6bd..acb42ff7cfe4 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 82ea48587784..0562289394a4 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 61b6e39ae6dd..15a3e43843b8 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 @@ -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 79dbf6734fbe..2be2507f4be7 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 dcea2fb3f5c5..cca336797ae0 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 2f598720e787..6fb10091333d 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -39,12 +39,10 @@ #include #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(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 c9a039a45d25..0f35ad4935d5 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 d1c0c1dba427..0fd486cfdda9 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 175a8c6edee8..344898893343 100644 --- a/sal/osl/w32/nlsupport.c +++ b/sal/osl/w32/nlsupport.c @@ -33,7 +33,6 @@ #include #include - /* 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 c58d70dd18e4..14ee0efed5bc 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 149de07f73ce..40fdde642c98 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 0328a4fbc9db..830e41180c85 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(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 2b83d0c128b8..9f511e7053d8 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 #include - 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 iterator_pair_t; typedef std::vector 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 571e47a5e7c2..112b70e4bd8d 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(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 3eb9290a87fd..04fab2700fc8 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 84d01bb72f18..d4d7d125675d 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 @@ -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 a63e6926f975..6feec0cc413f 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( 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 2b7e74202f5c..881c4677151c 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 @@ -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 2b5ebebb777b..df56bdbdaeaf 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 422ad27ee98c..8c7e9d72ae5c 100644 --- a/sal/osl/w32/tempfile.cxx +++ b/sal/osl/w32/tempfile.cxx @@ -32,7 +32,6 @@ #include #include - // 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(_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 a5cf7155e408..2eeea0681550 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 4e66aaeceb6f..dd30c44da4e1 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 dabfb3afb9d6..7491bcf3a292 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 19e25c1d25f3..c0c647eb757b 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 592935f16a6b..04404660cf3b 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 276e3a29ebfc..3a674a8c64df 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 e855199455b9..301c8a9f9b3c 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; #endif /* _RTL_STRING_UTILS_CONST_H_ */ - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx index 417cc3bfb853..1f1a14b180e7 100644 --- a/sal/qa/osl/condition/osl_Condition.cxx +++ b/sal/qa/osl/condition/osl_Condition.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - // include files #include @@ -27,11 +25,8 @@ using namespace osl; using namespace rtl; - - // helper functions and classes - /** print Boolean value. */ inline void printBool( bool bOk ) @@ -92,11 +87,8 @@ protected: } }; - - // test code start here - namespace osl_Condition { @@ -133,7 +125,6 @@ namespace osl_Condition CPPUNIT_TEST_SUITE_END( ); }; // class ctors - /** testing the method: void set() */ @@ -171,14 +162,12 @@ namespace osl_Condition bRes && !bRes1 && bRes2 ); } - CPPUNIT_TEST_SUITE( set ); CPPUNIT_TEST( set_001 ); CPPUNIT_TEST( set_002 ); CPPUNIT_TEST_SUITE_END( ); }; // class set - /** testing the method: void reset() */ @@ -223,7 +212,6 @@ namespace osl_Condition CPPUNIT_TEST_SUITE_END( ); }; // class reset - /** testing the method: Result wait(const TimeValue *pTimeout = 0) */ @@ -246,7 +234,6 @@ namespace osl_Condition delete tv1; } - void wait_001( ) { ::osl::Condition cond1; @@ -291,7 +278,6 @@ namespace osl_Condition CPPUNIT_TEST_SUITE_END( ); }; // class wait - /** testing the method: sal_Bool check() */ @@ -338,21 +324,14 @@ namespace osl_Condition CPPUNIT_TEST_SUITE_END( ); }; // class check - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::set); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::reset); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::wait); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::check); - } // namespace osl_Condition - - - CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index e2f746a5cbc9..88df6384f362 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -39,14 +39,12 @@ #define OSLTEST_DECLARE_USTRING( str_name, str_value ) \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( str_value ) - // condition names OSLTEST_DECLARE_USTRING( TestCon, "testcondition" ); const char pTestString[17] = "Sun Microsystems"; - #endif /* _OSL_CONDITION_CONST_H_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index df9d3a5046b3..fcf3a8b15739 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // include files #include @@ -47,10 +46,8 @@ using ::rtl::OUStringToOString; using ::rtl::OString; using ::rtl::OStringToOUString; - // helper functions - /** detailed wrong message. */ inline ::rtl::OString errorToString( const ::osl::FileBase::RC _nError ) @@ -458,7 +455,6 @@ inline void deleteTestDirectory( const ::rtl::OUString& basename, const ::rtl::O deleteTestDirectory( aBaseURL ); } - /** Check for the file and directory access right. */ typedef enum { @@ -636,21 +632,16 @@ inline void changeFileMode( ::rtl::OUString & filepath, sal_Int32 mode ) inline ::rtl::OUString getCurrentPID( void ); - - - // Beginning of the test cases for FileBase class namespace osl_FileBase { - // testing the method // static inline RC getAbsoluteFileURL( const ::rtl::OUString& ustrBaseDirectoryURL, // const ::rtl::OUString& ustrRelativeFileURL, // ::rtl::OUString& ustrAbsoluteFileURL ) - class getAbsoluteFileURL:public CppUnit::TestFixture { //::osl::FileBase aFileBase; @@ -884,7 +875,6 @@ namespace osl_FileBase CPPUNIT_TEST_SUITE_END(); };// class SystemPath_FileURL - // if bDirection==sal_True, check getSystemPathFromFileURL // if bDirection==sal_False, check getFileURLFromSystemPath void SystemPath_FileURL::check_SystemPath_FileURL(rtl::OString const& _sSource, ::osl::FileBase::RC _nAssumeError, rtl::OString const& _sAssumeResultStr, bool bDirection) @@ -1190,10 +1180,6 @@ namespace osl_FileBase // start with "~user", not impletment // void SystemPath_FileURL::getFileURLFromSystemPath_006() - - - - // testing the method // static inline RC searchFileURL( const ::rtl::OUString& ustrFileName, // const ::rtl::OUString& ustrSearchPath, @@ -1253,7 +1239,6 @@ namespace osl_FileBase bOk1 && bOk2 && bOk3 && bOk4 ); } - void searchFileURL_003() { OSLTEST_DECLARE( SystemPathList, TEST_PLATFORM_ROOT ":" TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP ":" TEST_PLATFORM_ROOT "system/path" ); @@ -1292,8 +1277,6 @@ namespace osl_FileBase CPPUNIT_TEST_SUITE_END(); };// class searchFileURL - - // testing the method // static inline RC getTempDirURL( ::rtl::OUString& ustrTempDirURL ) @@ -1337,8 +1320,6 @@ namespace osl_FileBase CPPUNIT_TEST_SUITE_END(); };// class getTempDirURL - - // testing the method // static inline RC createTempFile( ::rtl::OUString* pustrDirectoryURL, // oslFileHandle* pHandle, @@ -1450,7 +1431,6 @@ namespace osl_FileBase CPPUNIT_TEST_SUITE_END(); };// class createTempFile - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getAbsoluteFileURL, "osl_FileBase" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::SystemPath_FileURL, "osl_FileBase" ); // CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getFileURLFromSystemPath, "osl_FileBase" ); @@ -1459,14 +1439,11 @@ namespace osl_FileBase CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::createTempFile, "osl_FileBase" ); }// namespace osl_FileBase - - // Beginning of the test cases for VolumeInfo class namespace osl_VolumeInfo { - // testing the method // VolumeInfo( sal_uInt32 nMask ): _nMask( nMask ) @@ -1562,8 +1539,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class ctors - - // testing the method // inline sal_Bool isValid( sal_uInt32 nMask ) const @@ -1642,7 +1617,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class isValid - // testing the method // inline sal_Bool getRemoteFlag() const @@ -1693,7 +1667,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getRemoteFlag - // testing the method // inline sal_Bool getRemoveableFlag() const @@ -1733,8 +1706,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getRemoveableFlag - - // testing the method // inline sal_Bool getCompactDiscFlag() const @@ -1774,8 +1745,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getCompactDiscFlag - - // testing the method // inline sal_Bool getFloppyDiskFlag() const @@ -1815,8 +1784,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getFloppyDiskFlag - - // testing the method // inline sal_Bool getFixedDiskFlag() const @@ -1856,7 +1823,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getFixedDiskFlag - // testing the method // inline sal_Bool getRAMDiskFlag() const @@ -1896,8 +1862,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getRAMDiskFlag - - // testing the method // inline sal_uInt64 getTotalSpace() const @@ -1942,8 +1906,6 @@ namespace osl_VolumeInfo } #endif - - #if defined(SOLARIS) void getTotalSpace_003() { @@ -1979,7 +1941,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getTotalSpace - // testing the method // inline sal_uInt64 getFreeSpace() const @@ -2024,7 +1985,6 @@ namespace osl_VolumeInfo } #endif - #if defined(SOLARIS) void getFreeSpace_003() { @@ -2053,7 +2013,6 @@ namespace osl_VolumeInfo } #endif - CPPUNIT_TEST_SUITE( getFreeSpace ); CPPUNIT_TEST( getFreeSpace_001 ); CPPUNIT_TEST( getFreeSpace_002 ); @@ -2061,7 +2020,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getFreeSpace - // testing the method // inline sal_uInt64 getUsedSpace() const @@ -2106,7 +2064,6 @@ namespace osl_VolumeInfo } #endif - #if defined(SOLARIS) void getUsedSpace_003() { @@ -2117,7 +2074,6 @@ namespace osl_VolumeInfo statvfs( name, &aStatFS); sal_uInt64 UsedSpace = ( aStatFS.f_blocks - aStatFS.f_bavail ) * aStatFS.f_frsize; - sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace; ::osl::VolumeInfo aVolumeInfo( mask ); nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo ); @@ -2136,7 +2092,6 @@ namespace osl_VolumeInfo } #endif - CPPUNIT_TEST_SUITE( getUsedSpace ); CPPUNIT_TEST( getUsedSpace_001 ); CPPUNIT_TEST( getUsedSpace_002 ); @@ -2144,8 +2099,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getUsedSpace - - // testing the method // inline sal_uInt32 getMaxNameLength() const @@ -2169,7 +2122,6 @@ namespace osl_VolumeInfo 0 != uiMaxNameLength ); } - #if defined(UNX) && !defined(ANDROID) void getMaxNameLength_002() { @@ -2204,8 +2156,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getMaxNameLength - - // testing the method // inline sal_uInt32 getMaxPathLength() const @@ -2229,7 +2179,6 @@ namespace osl_VolumeInfo 0 != uiMaxPathLength ); } - #if ( defined UNX ) void getMaxPathLength_002() { @@ -2251,15 +2200,12 @@ namespace osl_VolumeInfo } #endif - CPPUNIT_TEST_SUITE( getMaxPathLength ); CPPUNIT_TEST( getMaxPathLength_001 ); CPPUNIT_TEST( getMaxPathLength_002 ); CPPUNIT_TEST_SUITE_END(); };// class getMaxPathLength - - // testing the method // inline ::rtl::OUString getFileSystemName() const @@ -2284,7 +2230,6 @@ namespace osl_VolumeInfo !compareFileName( aNullURL, aUStr ) ); } - #if defined(SOLARIS) void getFileSystemName_002() { @@ -2313,14 +2258,12 @@ namespace osl_VolumeInfo } #endif - CPPUNIT_TEST_SUITE( getFileSystemName ); CPPUNIT_TEST( getFileSystemName_001 ); CPPUNIT_TEST( getFileSystemName_002 ); CPPUNIT_TEST_SUITE_END(); };// class getFileSystemName - // testing the method // inline VolumeDevice getDeviceHandle() const @@ -2350,8 +2293,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getDeviceHandle - - /*CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::ctors, "osl_VolumeInfo" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::isValid, "osl_VolumeInfo" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::getRemoteFlag, "osl_VolumeInfo" ); @@ -2369,15 +2310,11 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::getDeviceHandle, "osl_VolumeInfo" );*/ }// namespace osl_VolumeInfo - - - // Beginning of the test cases for VolumeDevice class namespace osl_FileStatus { - // testing the method // FileStatus( sal_uInt32 nMask ): _nMask( nMask ) @@ -2448,8 +2385,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class ctors - - // testing the method // inline sal_Bool isValid( sal_uInt32 nMask ) const @@ -2647,7 +2582,6 @@ namespace osl_FileStatus // ( sal_False == bOk1 ) && ( sal_True == bOk2 ) ); } - CPPUNIT_TEST_SUITE( isValid ); CPPUNIT_TEST( isValid_001 ); CPPUNIT_TEST( isValid_002 ); @@ -2656,8 +2590,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class ctors - - // testing the method // inline Type getFileType() const @@ -2773,7 +2705,6 @@ namespace osl_FileStatus { osl::FileStatus::Type eType = rFileStatus.getFileType(); - CPPUNIT_ASSERT_MESSAGE( "test for getFileType function: Special, Solaris version ", ( eType == ::osl::FileStatus::Special ) ); } @@ -2788,7 +2719,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileType - // testing the method // inline sal_uInt64 getAttributes() const @@ -2845,7 +2775,6 @@ namespace osl_FileStatus } #endif - void getAttributes_002() { #if ( defined UNX ) @@ -2861,7 +2790,6 @@ namespace osl_FileStatus #endif } - #if ( defined UNX ) void getAttributes_003() { @@ -2918,7 +2846,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getAttributes - // testing the method // inline TimeValue getAccessTime() const @@ -2974,7 +2901,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getAccessTime - // testing the method // inline TimeValue getModifyTime() const @@ -2987,7 +2913,6 @@ namespace osl_FileStatus public: getModifyTime() :nError(FileBase::E_None) {} - // test code. void getModifyTime_001() { @@ -3029,8 +2954,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getModifyTime - - // testing the method // inline sal_uInt64 getFileSize() const @@ -3096,7 +3019,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileSize - // testing the method // inline ::rtl::OUString getFileName() const @@ -3141,7 +3063,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileName - // testing the method // inline ::rtl::OUString getFileURL() const @@ -3185,7 +3106,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileURL - // testing the method // inline ::rtl::OUString getLinkTargetURL() const @@ -3257,7 +3177,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getLinkTargetURL - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::ctors, "osl_FileStatus" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::isValid, "osl_FileStatus" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getFileType, "osl_FileStatus" ); @@ -3270,9 +3189,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getLinkTargetURL, "osl_FileStatus" ); }// namespace osl_FileStatus - - - // Beginning of the test cases for File class namespace osl_File @@ -3332,7 +3248,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class ctors - // testing the method // inline RC open( sal_uInt32 uFlags ) @@ -3457,7 +3372,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class open - // testing the method // inline RC close() @@ -3521,8 +3435,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class close - - // testing the method // inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos ) @@ -3627,7 +3539,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setPos - // testing the method // inline RC getPos( sal_uInt64& uPos ) @@ -3692,8 +3603,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class getPos - - // testing the method // inline RC isEndOfFile( sal_Bool *pIsEOF ) @@ -3736,7 +3645,6 @@ namespace osl_File sal_Bool bEOF = sal_False; sal_Bool *pEOF = &bEOF; - nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3787,8 +3695,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class isEndOfFile - - // testing the method // inline RC setSize( sal_uInt64 uSize ) @@ -3832,7 +3738,6 @@ namespace osl_File // sal_Bool *pEOF = &bEOF; sal_uInt64 nFilePointer; - nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3860,7 +3765,6 @@ namespace osl_File // sal_Bool *pEOF = &bEOF; sal_uInt64 nFilePointer; - nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3887,8 +3791,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setSize - - // testing the method // inline RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead ) @@ -3931,7 +3833,6 @@ namespace osl_File sal_uInt64 nFilePointer; sal_Char buffer_read[10]; - nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3953,7 +3854,6 @@ namespace osl_File sal_uInt64 nFilePointer; sal_Char buffer_read[26]; - nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3977,7 +3877,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class read - // testing the method // inline RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten) @@ -4037,7 +3936,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class write - // testing the method // inline RC readLine( ::rtl::ByteSequence& aSeq ) @@ -4150,7 +4048,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class readLine - // testing the method // inline static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL ) @@ -4285,7 +4182,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class copy - // testing the method // inline static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL ) @@ -4446,8 +4342,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class move - - // testing the method // inline static RC remove( const ::rtl::OUString& ustrFileURL ) @@ -4532,8 +4426,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class remove - - // testing the method // inline static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes ) @@ -4624,8 +4516,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setAttributes - - // testing the method // inline static RC setTime( // const ::rtl::OUString& ustrFileURL, @@ -4713,7 +4603,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setTime - // testing the method // inline static RC sync() @@ -4768,14 +4657,11 @@ namespace osl_File } //test case:no enough space, how to create such case???see test_cpy_wrt_file.cxx::test_osl_writeFile - - CPPUNIT_TEST_SUITE( sync ); CPPUNIT_TEST( sync_001 ); CPPUNIT_TEST_SUITE_END(); };// class setTime - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::ctors, "osl_File" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::open, "osl_File" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::close, "osl_File" ); @@ -4797,8 +4683,6 @@ namespace osl_File }// namespace osl_File - - // Beginning of the test cases for DirectoryItem class namespace osl_DirectoryItem @@ -4845,7 +4729,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class ctors - // testing the method // DirectoryItem( const DirectoryItem& rItem ): _pData( rItem._pData) @@ -4908,7 +4791,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class copy_assin_Ctors - // testing the method // inline sal_Bool is() @@ -4957,7 +4839,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class is - // testing the method // static inline RC get( const ::rtl::OUString& ustrFileURL, DirectoryItem& rItem ) @@ -5024,7 +4905,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class get - // testing the method // inline RC getFileStatus( FileStatus& rStatus ) @@ -5096,7 +4976,6 @@ namespace osl_DirectoryItem compareFileName( rFileStatus.getFileName(), aTmpName1 ) ); } - CPPUNIT_TEST_SUITE( getFileStatus ); CPPUNIT_TEST( getFileStatus_001 ); CPPUNIT_TEST( getFileStatus_002 ); @@ -5104,8 +4983,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class getFileStatus - - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::ctors, "osl_DirectoryItem" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::copy_assin_Ctors, "osl_DirectoryItem" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::is, "osl_DirectoryItem" ); @@ -5113,7 +4990,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::getFileStatus, "osl_DirectoryItem" ); }// namespace osl_DirectoryItem - // Beginning of the test cases for Directory class namespace osl_Directory @@ -5183,7 +5059,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class ctors - // testing the method // inline RC open() @@ -5282,7 +5157,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class open - // testing the method // inline sal_Bool isOpen() { return _pData != NULL; }; @@ -5340,7 +5214,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class isOpen - // testing the method // inline RC close() @@ -5390,14 +5263,12 @@ namespace osl_Directory ( ::osl::FileBase::E_BADF == nError1 ) ); } - CPPUNIT_TEST_SUITE( close ); CPPUNIT_TEST( close_001 ); CPPUNIT_TEST( close_002 ); CPPUNIT_TEST_SUITE_END(); };// class close - // testing the method // inline RC reset() @@ -5482,7 +5353,6 @@ namespace osl_Directory ( ::osl::FileBase::E_NOENT == nError1 ) ); } - void reset_003() { ::osl::Directory testDirectory( aTmpName4 ); //constructor @@ -5513,7 +5383,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class reset - // testing the method // inline RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 ) @@ -5684,7 +5553,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class getNextItem - // testing the method // inline static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo ) @@ -5774,7 +5642,6 @@ namespace osl_Directory } } - void getVolumeInfo_001_1() { sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName; @@ -5862,8 +5729,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class getVolumeInfo - - // testing the method // inline static RC create( const ::rtl::OUString& ustrDirectoryURL ) @@ -5942,7 +5807,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class create - // testing the method // inline static RC remove( const ::rtl::OUString& ustrDirectoryURL ) @@ -6036,10 +5900,8 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class remove - // TEST Directory::createPath - #ifdef WNT # define PATH_BUFFER_SIZE MAX_PATH #else @@ -6048,7 +5910,6 @@ namespace osl_Directory #define TEST_PATH_POSTFIX "hello/world" - OUString get_test_path() { static OUString test_path; @@ -6102,7 +5963,6 @@ namespace osl_Directory return test_path; } - void rm_test_path(const OUString& path) { sal_Unicode buffer[PATH_BUFFER_SIZE]; @@ -6123,7 +5983,6 @@ namespace osl_Directory } } - class DirCreatedObserver : public DirectoryCreationObserver { public: @@ -6145,8 +6004,6 @@ namespace osl_Directory int i; }; - - class createPath : public CppUnit::TestFixture { public: @@ -6154,12 +6011,10 @@ namespace osl_Directory createPath() {} - void with_relative_path() { FileBase::RC rc = Directory::createPath( OUString(TEST_PATH_POSTFIX)); - CPPUNIT_ASSERT_MESSAGE ( "osl_createDirectoryPath contract broken", @@ -6167,7 +6022,6 @@ namespace osl_Directory ); } - void without_callback() { OUString tp_url = get_test_path(); @@ -6185,7 +6039,6 @@ namespace osl_Directory ); } - void with_callback() { OUString tp_url = get_test_path(); @@ -6209,7 +6062,6 @@ namespace osl_Directory #ifdef WNT - const char* get_unused_drive_letter() { static const char m_aBuff[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -6227,7 +6079,6 @@ namespace osl_Directory return NULL; } - void at_invalid_logical_drive() { const char* drv = get_unused_drive_letter(); @@ -6263,7 +6114,6 @@ namespace osl_Directory }; // class createPath - CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::ctors ); CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::open ); CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::isOpen ); @@ -6276,12 +6126,8 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::createPath ); }// namespace osl_Directory - - CPPUNIT_PLUGIN_IMPLEMENT(); - - /** get Current PID. */ inline ::rtl::OUString getCurrentPID( ) @@ -6296,7 +6142,6 @@ inline ::rtl::OUString getCurrentPID( ) return ( OUString::number( nPID ) ); } - //~ do some clean up work after all test completed. class GlobalObject { diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index ccb27f157992..6a27c86246b8 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -34,21 +34,16 @@ extern "C" { #endif - - - // common used string resource // these common used string will be used as assist resource in test // they are mostly OS independent, some of the resource can be reused // so, acommon test data repository will be better since it can be // shared among all test code - const sal_Char pBuffer_Char[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; const sal_Char pBuffer_Number[] = "1234567890"; const sal_Char pBuffer_Blank[] = ""; - // OS dependent/independent definitions/includes // we use FILE_PREFIX for URL prefix, // TEST_PLATFORM for test platform initial, @@ -58,14 +53,11 @@ const sal_Char pBuffer_Blank[] = ""; // PATH_SEPARATOR for separator in URL or system path in comrresponding platform, // PATH_MAX/MAX_PATH for max path length in comrresponding platform, - - // OS independent const definition # define FILE_PREFIX "file:///" # define TEST_FILE_SIZE 1024 - // OS dependent declaration and includes #if ( defined UNX ) //Unix @@ -105,21 +97,17 @@ const sal_Char pBuffer_Blank[] = ""; # define PATH_SEPARATOR "/" #endif - - // macro definition for the ASCII array/OUString declarations, // we use p### for the ASCII array, // a### for the OUString, // n###Len for its length - #define OSLTEST_DECLARE( str_name, str_value ) \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( ( str_value ) ) #define OSLTEST_DECLARE_UTF8(str_name, str_value ) \ ::rtl::OUString a##str_name = ::rtl::Uri::decode( ::rtl::OUString::createFromAscii( ( str_value ) ), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8) - // OS independent file definition OSLTEST_DECLARE( NullURL, "" ); @@ -132,7 +120,6 @@ OSLTEST_DECLARE( TempDirectorySys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP ); OSLTEST_DECLARE( UserDirectoryURL, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "" ); OSLTEST_DECLARE( UserDirectorySys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "" ); - // common used URL:temp, canonical, root, relative, link,etc OSLTEST_DECLARE( CanURL1, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/canonical.name" ); @@ -158,7 +145,6 @@ OSLTEST_DECLARE( RelURL5, TEST_PLATFORM_TEMP "/./../" TEST_PLATFORM_TEMP ); OSLTEST_DECLARE( LnkURL1, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/link.file" ); OSLTEST_DECLARE( HidURL1, ".hiddenfile" ); - // common used System Path:temp, root,etc OSLTEST_DECLARE( RootSys, TEST_PLATFORM_ROOT ); @@ -170,7 +156,6 @@ OSLTEST_DECLARE_UTF8( SysPath5, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/%E6%9C%A OSLTEST_DECLARE( SysPathLnk, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/link.file" ); OSLTEST_DECLARE( FifoSys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir/fifo" ); - // FileType URL, we pick some canonical file in corresponding system for test: // socket, link, etc. // Note that this may be changed in the different platform, so be careful to use. @@ -185,7 +170,6 @@ OSLTEST_DECLARE( TypeURL2, FILE_PREFIX "" ); OSLTEST_DECLARE( TypeURL3, FILE_PREFIX "" ); #endif - // Volume device URL, we pick some canonical volume device for test: // UNIX file system, Floppy Disk, Proc file system, Temp file system, Compact Disk. diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 172ff028d372..402bbfb483d1 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -38,8 +38,6 @@ namespace osl_test_file { - - class oldtestfile : public CppUnit::TestFixture { public: @@ -144,10 +142,8 @@ void oldtestfile::test_file_004() } // namespace osl_test_file - CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::oldtestfile); - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index a808fb942a13..2eb0083535ee 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -72,7 +72,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - // register test suites CPPUNIT_TEST_SUITE_REGISTRATION(test_osl_writeFile); diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index e93e29acd61e..43387045af37 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - // include files #include @@ -31,7 +29,6 @@ using ::rtl::OString; // helper functions and classes - /** print Boolean value. */ inline void printBool( bool bOk ) @@ -142,11 +139,8 @@ inline void deleteTestFile( const ::rtl::OUString& filename ) CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: remove ", ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) ); } - - // test code start here - namespace osl_Module { @@ -162,7 +156,6 @@ namespace osl_Module }; }; - /** testing the methods: Module(); Module( const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT); @@ -205,7 +198,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class ctors - /** testing the methods: static sal_Bool getUrlFromAddress(void * addr, ::rtl::OUString & libraryUrl) */ @@ -255,7 +247,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class getUrlFromAddress - /** testing the method: sal_Bool SAL_CALL load( const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT) @@ -284,7 +275,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class load - /** testing the method: void SAL_CALL unload() */ @@ -309,7 +299,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class unload - /** testing the methods: sal_Bool SAL_CALL is() const */ @@ -341,7 +330,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class is - /** testing the methods: void* SAL_CALL getSymbol( const ::rtl::OUString& strSymbolName) */ @@ -371,7 +359,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class getSymbol - /** testing the methods: operator oslModule() const */ @@ -449,7 +436,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class getFunctionSymbol - CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getUrlFromAddress); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::load); @@ -459,11 +445,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getSymbol); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::optr_oslModule); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getFunctionSymbol); - } // namespace osl_Module - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index 4dd4fe437f40..f5417023b2a7 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -38,12 +38,10 @@ # define FILE_PREFIX "file:///" - // function pointer type. typedef sal_Bool (* FuncPtr )( sal_Bool ); - #endif /* _OSL_MODULE_CONST_H_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index dce24e73e8c4..e06acee5e542 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // include files #include @@ -30,10 +29,8 @@ using namespace osl; using namespace rtl; - // helper functions - /** print a UNI_CODE String. */ inline void printUString( const ::rtl::OUString & str ) @@ -75,12 +72,8 @@ namespace ThreadHelper } } - - // Beginning of the test cases for osl_Mutex class - - /** mutually exclusive data */ struct resource { @@ -145,7 +138,6 @@ protected: } }; - /** chain structure used in Threads as critical resource */ struct chain { @@ -262,8 +254,6 @@ protected: } }; - - namespace osl_Mutex { @@ -361,7 +351,6 @@ namespace osl_Mutex CPPUNIT_TEST_SUITE_END( ); }; // class ctor - /** Test of the osl::Mutex::acquire method */ class acquire : public CppUnit::TestFixture @@ -416,7 +405,6 @@ namespace osl_Mutex CPPUNIT_TEST_SUITE_END( ); }; // class acquire - /** Test of the osl::Mutex::tryToAcquire method */ class tryToAcquire : public CppUnit::TestFixture @@ -497,8 +485,6 @@ namespace osl_Mutex CPPUNIT_TEST_SUITE_END( ); }; // class release - - /** Test of the osl::Mutex::getGlobalMutex method */ class getGlobalMutex : public CppUnit::TestFixture @@ -548,7 +534,6 @@ namespace osl_Mutex CPPUNIT_TEST_SUITE_END(); }; // class getGlobalMutex - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::ctor, "osl_Mutex"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::acquire, "osl_Mutex"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::tryToAcquire, "osl_Mutex"); @@ -556,11 +541,8 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::release, "osl_Mutex"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::getGlobalMutex, "osl_Mutex"); } // namespace osl_Mutex - - // Beginning of the test cases for osl_Guard class - class GuardThread : public Thread { public: @@ -582,7 +564,6 @@ protected: } }; - namespace osl_Guard { class ctor : public CppUnit::TestFixture @@ -636,15 +617,11 @@ namespace osl_Guard CPPUNIT_TEST_SUITE_END(); }; // class ctor - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Guard::ctor, "osl_Guard"); } // namespace osl_Guard - - // Beginning of the test cases for osl_ClearableGuard class - /** Thread for test ClearableGuard */ class ClearGuardThread : public Thread @@ -673,7 +650,6 @@ protected: } }; - namespace osl_ClearableGuard { @@ -777,16 +753,12 @@ namespace osl_ClearableGuard CPPUNIT_TEST_SUITE_END( ); }; // class clear - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_ClearableGuard::ctor, "osl_ClearableGuard" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_ClearableGuard::clear, "osl_ClearableGuard" ); } // namespace osl_ClearableGuard - - // Beginning of the test cases for osl_ResettableGuard class - /** Thread for test ResettableGuard */ class ResetGuardThread : public Thread @@ -813,7 +785,6 @@ protected: } }; - namespace osl_ResettableGuard { class ctor : public CppUnit::TestFixture @@ -847,7 +818,6 @@ namespace osl_ResettableGuard bRes); } - CPPUNIT_TEST_SUITE(ctor); CPPUNIT_TEST(ctor_001); CPPUNIT_TEST(ctor_002); @@ -903,7 +873,6 @@ namespace osl_ResettableGuard CPPUNIT_TEST_SUITE_END(); }; // class reset - CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::ctor); CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::reset); } // namespace osl_ResettableGuard diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h index 133f1f02e231..fb6bfaa5f1eb 100644 --- a/sal/qa/osl/mutex/osl_Mutex_Const.h +++ b/sal/qa/osl/mutex/osl_Mutex_Const.h @@ -32,7 +32,6 @@ #define BUFFER_SIZE 16 - #endif /* _OSL_MUTEX_CONST_H_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 58cce66b1b52..a91ea189fc9f 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // include files - #include #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" @@ -47,10 +45,8 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; - // helper functions - /** print Boolean value. */ inline void printBool( sal_Bool bOk ) @@ -116,9 +112,6 @@ inline void printPipeError( ::osl::Pipe aPipe ) } } - - - // pipe name and transfer contents const rtl::OUString aTestPipeName("testpipe2"); @@ -128,14 +121,11 @@ const rtl::OUString aTestString("Sun Microsystems"); const OString m_pTestString1("Sun Microsystems"); const OString m_pTestString2("test pipe PASS/OK"); - // test code start here - namespace osl_Pipe { - // most return value -1 denote a fail of operation. #define OSL_PIPE_FAIL -1 @@ -228,7 +218,6 @@ namespace osl_Pipe ///aPipe.clear( ); ///bRes1 = aNoAcquirePipe.is( ); - CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with no acquire of handle, only validation test, do not know how to test no acquire.", sal_True == bRes ); } @@ -258,7 +247,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class ctors - /** testing the method: inline sal_Bool SAL_CALL is() const; */ @@ -302,7 +290,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class is - /** testing the methods: inline sal_Bool create( const ::rtl::OUString & strName, oslPipeOptions Options, const Security &rSec ); @@ -385,7 +372,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class create - /** testing the method: inline void SAL_CALL clear(); */ @@ -410,7 +396,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class clear - /** testing the methods: inline Pipe& SAL_CALL operator= (const Pipe& pipe); inline Pipe& SAL_CALL operator= (const oslPipe pipe ); @@ -454,7 +439,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class assign - /** testing the method: inline sal_Bool SAL_CALL isValid() const; isValid( ) has not been implemented under the following platforms, please refer to osl/pipe.hxx @@ -503,7 +487,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class isEqual - /** testing the method: inline void SAL_CALL close(); */ @@ -541,7 +524,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class close - /** testing the method: inline oslPipeError SAL_CALL accept(StreamPipe& Connection); please refer to StreamPipe::recv @@ -585,7 +567,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class getError - /** testing the method: inline oslPipe SAL_CALL getHandle() const; */ @@ -622,8 +603,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class getHandle - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::is); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::create); @@ -634,10 +613,8 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::getError); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::getHandle); - } // namespace osl_Pipe - namespace osl_StreamPipe { @@ -761,7 +738,6 @@ namespace osl_StreamPipe CPPUNIT_TEST_SUITE_END( ); }; // class ctors - /** testing the methods: inline StreamPipe & SAL_CALL operator=(oslPipe Pipe); inline StreamPipe& SAL_CALL operator=(const Pipe& pipe); @@ -782,7 +758,6 @@ namespace osl_StreamPipe } // test read/write & send/recv data to pipe - class Pipe_DataSink_Thread : public Thread { public: @@ -922,12 +897,10 @@ namespace osl_StreamPipe CPPUNIT_TEST_SUITE_END( ); }; // class recv - CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::ctors); //CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::assign); CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::recv); - } // namespace osl_StreamPipe CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index e4b388298b2f..4778ea1989ca 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -24,7 +24,6 @@ #include #endif - // include files #include @@ -50,7 +49,6 @@ using namespace osl; using ::rtl::OString; - // Small stopwatch class StopWatch { TimeValue t1,t2; // Start and stoptime @@ -155,7 +153,6 @@ double StopWatch::getTenthSec() const return nValue ; } - template class ThreadSafeValue { @@ -179,7 +176,6 @@ public: void release() {m_aMutex.release();} }; - namespace ThreadHelper { void thread_sleep_tenth_sec(sal_Int32 _nTenthSec) @@ -266,7 +262,6 @@ public: }; - /** Thread which has a flag add 1 every second until 20 */ class OCountThread : public Thread @@ -564,8 +559,6 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_END(); }; // class create - - /** Test of the osl::Thread::createSuspended method */ class createSuspended : public CppUnit::TestFixture @@ -1064,7 +1057,6 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_END(); }; // class isRunning - /// check osl::Thread::setPriority class setPriority : public CppUnit::TestFixture { @@ -1109,7 +1101,6 @@ namespace osl_Thread return sPrioStr; } - /** check 2 threads. ALGORITHM: @@ -1508,7 +1499,6 @@ namespace osl_Thread #endif } - CPPUNIT_TEST_SUITE(setPriority); #ifndef SOLARIS CPPUNIT_TEST(setPriority_002); @@ -1580,7 +1570,6 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_END(); }; // class getPriority - class getIdentifier : public CppUnit::TestFixture { public: @@ -1737,7 +1726,6 @@ namespace osl_Thread { } - CPPUNIT_TEST_SUITE(yield); CPPUNIT_TEST(yield_001); CPPUNIT_TEST_SUITE_END(); @@ -1867,7 +1855,6 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_END(); }; // class schedule - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::create, "osl_Thread"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::createSuspended, "osl_Thread"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::suspend, "osl_Thread"); @@ -1884,8 +1871,6 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::schedule, "osl_Thread"); } // namespace osl_Thread - - // destroy function when the binding thread terminate void SAL_CALL destroyCallback(void * data) { @@ -1987,7 +1972,6 @@ namespace osl_ThreadData CPPUNIT_TEST_SUITE_END(); }; // class ctors - class setData : public CppUnit::TestFixture { public: @@ -2185,7 +2169,6 @@ namespace osl_ThreadData CPPUNIT_TEST_SUITE_END(); }; // class getData - CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::setData); CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::getData); diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index e4d2028fb55e..db6d19c382ff 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -70,7 +70,6 @@ const rtl::OUString EXECUTABLE_NAME ("osl_process_child"); #endif - using namespace osl; using ::rtl::OUString; @@ -102,7 +101,6 @@ inline ::rtl::OUString getExecutablePath( void ) //rtl::OUString CWD = getExecutablePath(); - class Test_osl_joinProcess : public CppUnit::TestFixture { const OUString join_param_; @@ -308,13 +306,10 @@ public: CPPUNIT_TEST_SUITE_END(); }; - - typedef std::vector > string_container_t; typedef string_container_t::const_iterator string_container_const_iter_t; typedef string_container_t::iterator string_container_iter_t; - class exclude : public std::unary_function { public: @@ -327,7 +322,6 @@ public: exclude_list_.push_back(env_var_name(*iter)); } - bool operator() (const std::string& env_var) const { return (exclude_list_.end() != @@ -405,7 +399,6 @@ namespace } #endif - class Test_osl_executeProcess : public CppUnit::TestFixture { const OUString env_param_; @@ -419,7 +412,6 @@ class Test_osl_executeProcess : public CppUnit::TestFixture public: - // ctor Test_osl_executeProcess() : env_param_(OUString("-env")), @@ -432,7 +424,6 @@ public: suExecutableFileURL += EXECUTABLE_NAME; } - virtual void setUp() SAL_OVERRIDE { temp_file_path_ = create_temp_file(temp_file_url_); @@ -444,7 +435,6 @@ public: osl::File::remove(temp_file_url_); } - OUString create_temp_file(OUString &temp_file_url) { FileBase::RC rc = FileBase::createTempFile(0, 0, &temp_file_url); @@ -457,7 +447,6 @@ public: return temp_file_path; } - void read_child_environment(string_container_t* env_container) { OString temp_file_name = OUStringToOString(OUString( @@ -477,7 +466,6 @@ public: tidy_container(*env_container); } - // environment of the child process that was // started. The child process writes his // environment into a file @@ -493,7 +481,6 @@ public: (std::equal(child_env.begin(), child_env.end(), parent_env.begin()))); } - // compare the equal environment parts and the // different part of the child environment bool compare_merged_environments(const string_container_t& different_env_vars) @@ -549,7 +536,6 @@ public: std::cerr << "different should be: " << *iter << std::endl; #endif - #if OSL_DEBUG_LEVEL > 1 for (string_container_t::const_iterator iter = different_child_env_vars.begin(), end = different_child_env_vars.end(); iter != end; ++iter) std::cerr << "different are: " << *iter << std::endl; @@ -563,7 +549,6 @@ public: different_env_size_equals && different_env_content_equals); } - // test that parent and child process have the // same environment when osl_executeProcess will // be called with out setting new environment @@ -605,7 +590,6 @@ public: ); } - #define ENV1 "PAT=a:\\" #define ENV2 "PATHb=b:\\" #define ENV3 "Patha=c:\\" @@ -748,7 +732,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - // register test suites //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_osl_joinProcess, "Test_osl_joinProcess"); CPPUNIT_TEST_SUITE_REGISTRATION(Test_osl_executeProcess); diff --git a/sal/qa/osl/process/osl_process_child.cxx b/sal/qa/osl/process/osl_process_child.cxx index 3a303d5bae9b..ca9adb3441c7 100644 --- a/sal/qa/osl/process/osl_process_child.cxx +++ b/sal/qa/osl/process/osl_process_child.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - - - #if ( defined WNT ) // Windows # define UNICODE # define _UNICODE @@ -48,23 +44,17 @@ # endif #endif - - - #ifdef WNT # define SLEEP(t) (Sleep((t)*1000)) #else # define SLEEP(t) (sleep((t))) #endif - void wait_for_seconds(char* time) { SLEEP(atoi(time)); } - - #ifdef WNT void w_to_a(LPCTSTR _strW, LPSTR strA, DWORD size) @@ -99,7 +89,6 @@ void w_to_a(LPCTSTR _strW, LPSTR strA, DWORD size) } #endif - int main(int argc, char* argv[]) { if (argc > 2) diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index cc8fe8ca00ce..97ef52143655 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -57,10 +57,8 @@ void oldtests::test_profile(void) } // namespace osl_Profile - CPPUNIT_TEST_SUITE_REGISTRATION( osl_Profile::oldtests ); - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index 61a79340ca24..14e339e027ef 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // header file #ifdef WNT @@ -32,11 +31,8 @@ using namespace osl; using namespace rtl; - - // helper functions and classes - /** print Boolean value. */ inline void printBool( bool bOk ) @@ -56,11 +52,8 @@ inline void printUString( const ::rtl::OUString & str ) t_print("%s\n", aString.getStr( ) ); } - - // test code start here - namespace osl_Security { @@ -85,7 +78,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class ctors - /** testing the methods: inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString& strName, const ::rtl::OUString& strPasswd); @@ -116,7 +108,6 @@ namespace osl_Security bRes ); } - CPPUNIT_TEST_SUITE( logonUser ); if ( !aStringForward.isEmpty() && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) == aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) /// if user name and passwd are forwarded @@ -131,7 +122,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class logonUser - /** testing the method: inline sal_Bool Security::getUserIdent( rtl::OUString& strIdent) const */ @@ -162,7 +152,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class getUserIdent - /** testing the method: inline sal_Bool SAL_CALL getUserName( ::rtl::OUString& strName) const; */ @@ -195,7 +184,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class getUserName - /** testing the method: inline sal_Bool Security::getConfigDir( rtl::OUString& strDirectory ) const */ @@ -262,7 +250,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class getHandle - class UserProfile : public CppUnit::TestFixture { public: @@ -310,7 +297,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class loginUserOnFileServer - CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::logonUser); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserIdent); @@ -321,11 +307,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHandle); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::UserProfile); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::loginUserOnFileServer); - - } // namespace osl_Security - /* This defines an own TestPlugIn implementation with an own initialize() method that will be called after loading the PlugIn */ @@ -339,7 +322,6 @@ class MyTestPlugInImpl: public CPPUNIT_NS::TestPlugInDefaultImpl const CPPUNIT_NS::PlugInParameters ¶meters ) SAL_OVERRIDE; }; - void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, const CPPUNIT_NS::PlugInParameters & ) { @@ -355,7 +337,6 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, #if ( defined UNX ) /// some initialization work for UNIX OS - struct passwd* pw; CPPUNIT_ASSERT_MESSAGE( "getpwuid: no password entry\n",( pw = getpwuid( getuid() ) ) != NULL ); @@ -383,7 +364,6 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, #if defined ( WNT ) /// some initialization work for Windows OS - /// Get the user name, computer name, user home directory. LPTSTR lpszSystemInfo; // pointer to system information string DWORD cchBuff = BUFSIZE; // size of computer or user name @@ -423,7 +403,6 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, RegCloseKey(hRegKey); } - /// Get user Security ID: // Create buffers that may be large enough. If a buffer is too small, the count parameter will be set to the size needed. @@ -555,7 +534,6 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, delete [] reinterpret_cast(pSid); delete [] wszDomainName; - /// check if logged in user is administrator: BOOL b; @@ -679,5 +657,4 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( MyTestPlugInImpl ); CPPUNIT_PLUGIN_IMPLEMENT_MAIN(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx index 5a70fdacf600..85d5d4c63fb9 100644 --- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx +++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx @@ -43,10 +43,8 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ - // include files - #include #include #include @@ -63,10 +61,8 @@ using ::rtl::OUString; #define IP_PORT_MYPORT4 8885 #define IP_PORT_MYPORT3 8884 - // helper functions - // just used to test socket::close() when accepting class AcceptorThread : public Thread { @@ -162,7 +158,6 @@ namespace osl_AcceptorSocket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -181,7 +176,6 @@ namespace osl_AcceptorSocket csConnectorSocket.close( ); } - void listen_accept_001() { ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 ); @@ -229,7 +223,6 @@ namespace osl_AcceptorSocket ( sal_True == compareSocketAddr( saPeerSocketAddr, saLocalSocketAddr ) ) ); } - CPPUNIT_TEST_SUITE( listen_accept ); CPPUNIT_TEST( listen_accept_001 ); CPPUNIT_TEST( listen_accept_002 ); @@ -237,17 +230,12 @@ namespace osl_AcceptorSocket }; // class listen_accept - - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::ctors); //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::operator_assign, "osl_AcceptorSocket"); CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::listen_accept); } // namespace osl_AcceptorSocket - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index 1765b3d394a1..261cfc2bc846 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx @@ -43,10 +43,8 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ - // include files - #include #include #include @@ -62,10 +60,8 @@ using ::rtl::OUString; #define IP_PORT_FTP 21 #define IP_PORT_MYPORT3 8884 - // helper functions - class CloseSocketThread : public Thread { ::osl::Socket &m_sSocket; @@ -128,7 +124,6 @@ namespace osl_ConnectorSocket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -146,7 +141,6 @@ namespace osl_ConnectorSocket csConnectorSocket.close( ); } - void connect_001() { ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT2 ); @@ -241,16 +235,11 @@ namespace osl_ConnectorSocket }; // class connect - - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::connect); } // namespace osl_ConnectorSocket - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx index b72a4d289449..3fb83cfa9815 100644 --- a/sal/qa/osl/socket/osl_DatagramSocket.cxx +++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx @@ -60,10 +60,8 @@ using ::rtl::OUString; const char * pTestString1 = "test socket"; const char * pTestString2 = " Passed#OK"; - // helper functions - class CloseSocketThread : public Thread { ::osl::Socket m_sSocket; @@ -88,10 +86,8 @@ public: } }; - // tests cases begins here - namespace osl_DatagramSocket { @@ -114,7 +110,6 @@ namespace osl_DatagramSocket osl_Socket_TypeDgram == dsSocket.getType( ) ); } - CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); CPPUNIT_TEST_SUITE_END(); @@ -293,15 +288,11 @@ public: }; // class sendTo_recvFrom - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom); } // namespace osl_DatagramSocket - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index f1597a329e14..086c95383f7f 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -43,11 +43,8 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ - - // include files - #include #include @@ -79,10 +76,8 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; - // helper functions - /** compare two OUString. */ inline sal_Bool compareUString( const ::rtl::OUString & ustr1, const ::rtl::OUString & ustr2 ) @@ -379,7 +374,6 @@ public: }; - /** Server Socket Thread, served as a temp little server to communicate with client. */ class ServerSocketThread : public Thread @@ -450,7 +444,6 @@ public: } }; - // Helper functions, to create buffers, check buffers class ValueCheckProvider { @@ -504,7 +497,6 @@ public: }; - /** Client Socket Thread, served as a temp little client to communicate with server. */ @@ -647,7 +639,6 @@ public: }; - // just used to test socket::close() when accepting class AcceptorThread : public Thread { @@ -726,10 +717,8 @@ public: } }; - // tests cases begins here - namespace osl_SocketAddr { @@ -875,7 +864,6 @@ namespace osl_SocketAddr }; // class ctors - /** testing the method: inline sal_Bool is() const; */ @@ -915,7 +903,6 @@ namespace osl_SocketAddr }; // class is - /** testing the method: inline ::rtl::OUString SAL_CALL getHostname( oslSocketResult *pResult = 0 ) const; */ @@ -986,7 +973,6 @@ namespace osl_SocketAddr CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } - CPPUNIT_TEST_SUITE( getHostname ); CPPUNIT_TEST( getHostname_001 ); CPPUNIT_TEST( getHostname_002 ); @@ -994,7 +980,6 @@ namespace osl_SocketAddr }; // class getHostname - /** testing the method: inline sal_Int32 SAL_CALL getPort() const; */ @@ -1037,7 +1022,6 @@ namespace osl_SocketAddr }; // class getPort - /** testing the method: inline sal_Bool SAL_CALL setPort( sal_Int32 nPort ); rfc1413.txt: TCP port numbers are from 1-65535 @@ -1106,7 +1090,6 @@ namespace osl_SocketAddr bOK == sal_False); } - CPPUNIT_TEST_SUITE( setPort ); CPPUNIT_TEST( setPort_001 ); CPPUNIT_TEST( setPort_002 ); @@ -1116,7 +1099,6 @@ namespace osl_SocketAddr }; // class setPort - /** tester comment: In the following two functions, it use ::rtl::ByteSequence as an intermediate storage for address, @@ -1126,7 +1108,6 @@ namespace osl_SocketAddr so may be a sal_uInt8 array is better. */ - /** testing the method: inline sal_Bool SAL_CALL setAddr( const ::rtl::ByteSequence & address ); */ @@ -1148,14 +1129,12 @@ namespace osl_SocketAddr sal_True == bOK ); } - CPPUNIT_TEST_SUITE( setAddr ); CPPUNIT_TEST( setAddr_001 ); CPPUNIT_TEST_SUITE_END( ); }; // class setAddr - /** testing the method: inline ::rtl::ByteSequence SAL_CALL getAddr( oslSocketResult *pResult = 0 ) const; */ @@ -1184,7 +1163,6 @@ namespace osl_SocketAddr }; // class getAddr - /** testing the methods: inline SocketAddr & SAL_CALL operator= (oslSocketAddr Addr); inline SocketAddr & SAL_CALL operator= (const SocketAddr& Addr); @@ -1212,7 +1190,6 @@ namespace osl_SocketAddr sal_True == bOK ); } - void operator_equal_002() { ::osl::SocketAddr saSocketAddr( aHostIp3, IP_PORT_TELNET); @@ -1301,8 +1278,6 @@ namespace osl_SocketAddr }; // class operator_equal - - /** testing the method: inline oslSocketAddr SAL_CALL getHandle() const; */ @@ -1342,7 +1317,6 @@ namespace osl_SocketAddr }; // class getSocketAddrHandle - /** testing the method: static inline ::rtl::OUString SAL_CALL getLocalHostname( oslSocketResult *pResult = 0); */ @@ -1396,7 +1370,6 @@ namespace osl_SocketAddr }; // class getLocalHostname - /** testing the method: static inline void SAL_CALL resolveHostname( const ::rtl::OUString & strHostName , SocketAddr & Addr ); */ @@ -1424,7 +1397,6 @@ namespace osl_SocketAddr }; // class resolveHostname - /** testing the method: static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, @@ -1468,9 +1440,6 @@ namespace osl_SocketAddr }; // class gettheServicePort - - - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::ctors, "osl_SocketAddr"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::is, "osl_SocketAddr"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getHostname, "osl_SocketAddr"); @@ -1484,11 +1453,8 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getLocalHostname, "osl_Soc CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::resolveHostname, "osl_SocketAddr"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::gettheServicePort, "osl_SocketAddr"); - } // namespace osl_SocketAddr - - namespace osl_Socket { @@ -1509,7 +1475,6 @@ namespace osl_Socket the use of C method lost some of the transparent of tester using C++ wrapper. */ - class ctors : public CppUnit::TestFixture { public: @@ -1525,7 +1490,6 @@ namespace osl_Socket sHandle = NULL; } - void ctors_none() { /// Socket constructor. @@ -1586,8 +1550,6 @@ namespace osl_Socket osl_Socket_TypeStream == sSocket.getType( ) ); } - - CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_none ); CPPUNIT_TEST( ctors_acquire ); @@ -1599,7 +1561,6 @@ namespace osl_Socket }; // class ctors - /** testing the methods: inline Socket& SAL_CALL operator= ( oslSocket socketHandle); inline Socket& SAL_CALL operator= (const Socket& sock); @@ -1622,7 +1583,6 @@ namespace osl_Socket sHandle = NULL; } - /** test writer's comment: the assignment operator does not support direct assinment like: @@ -1696,7 +1656,6 @@ namespace osl_Socket }; // class operators - /** testing the methods: inline void SAL_CALL shutdown( oslSocketDirection Direction = osl_Socket_DirReadWrite ); inline void SAL_CALL close(); @@ -1717,7 +1676,6 @@ namespace osl_Socket sHandle = NULL; } - void close_001() { ::osl::Socket sSocket(sHandle); @@ -1809,14 +1767,12 @@ namespace osl_Socket sal_True == bOK ); } - CPPUNIT_TEST_SUITE( getLocalAddr ); CPPUNIT_TEST( getLocalAddr_001 ); CPPUNIT_TEST_SUITE_END(); }; // class getLocalAddr - /** testing the method: inline sal_Int32 SAL_CALL getLocalPort() const; */ @@ -1836,7 +1792,6 @@ namespace osl_Socket sHandle = NULL; } - void getLocalPort_001() { ::osl::Socket sSocket(sHandle); @@ -1909,7 +1864,6 @@ namespace osl_Socket }; // class getLocalPort - /** testing the method: inline ::rtl::OUString SAL_CALL getLocalHost() const; @@ -1933,7 +1887,6 @@ namespace osl_Socket sHandle = NULL; } - void getLocalHost_001() { ::osl::Socket sSocket(sHandle); @@ -1984,7 +1937,6 @@ namespace osl_Socket }; // class getLocalHost - /** testing the methods: inline void SAL_CALL getPeerAddr( SocketAddr & Addr) const; inline sal_Int32 SAL_CALL getPeerPort() const; @@ -1998,7 +1950,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -2016,7 +1967,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void getPeer_001() { ::osl::SocketAddr saLocalSocketAddr( aHostIp1, IP_PORT_MYPORT ); @@ -2047,19 +1997,16 @@ namespace osl_Socket ( peerPort == saLocalSocketAddr.getPort( ) )); } - CPPUNIT_TEST_SUITE( getPeer ); CPPUNIT_TEST( getPeer_001 ); CPPUNIT_TEST_SUITE_END(); }; // class getPeer - /** testing the methods: inline sal_Bool SAL_CALL bind(const SocketAddr& LocalInterface); */ - class bind : public CppUnit::TestFixture { public: @@ -2075,7 +2022,6 @@ namespace osl_Socket sHandle = NULL; } - void bind_001() { ::osl::Socket sSocket(sHandle); @@ -2113,7 +2059,6 @@ namespace osl_Socket }; // class bind - /** testing the methods: inline sal_Bool SAL_CALL isRecvReady(const TimeValue *pTimeout = 0) const; @@ -2126,7 +2071,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -2144,7 +2088,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void isRecvReady_001() { ::osl::SocketAddr saLocalSocketAddr( aHostIp1, IP_PORT_MYPORT1 ); @@ -2170,14 +2113,12 @@ namespace osl_Socket ( sal_True == bOK3 ) ); } - CPPUNIT_TEST_SUITE( isRecvReady ); CPPUNIT_TEST( isRecvReady_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isRecvReady - /** testing the methods: inline sal_Bool SAL_CALL isSendReady(const TimeValue *pTimeout = 0) const; */ @@ -2189,7 +2130,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -2207,7 +2147,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void isSendReady_001() { ::osl::SocketAddr saLocalSocketAddr( aHostIp1, IP_PORT_MYPORT ); @@ -2234,14 +2173,12 @@ namespace osl_Socket ( sal_True == bOK3 ) ); } - CPPUNIT_TEST_SUITE( isSendReady ); CPPUNIT_TEST( isSendReady_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isSendReady - /** testing the methods: inline oslSocketType SAL_CALL getType() const; @@ -2262,7 +2199,6 @@ namespace osl_Socket sHandle = NULL; } - void getType_001() { sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp ); @@ -2308,8 +2244,6 @@ namespace osl_Socket }; // class getType - - /** testing the methods: inline sal_Int32 SAL_CALL getOption( oslSocketOption Option, @@ -2404,7 +2338,6 @@ namespace osl_Socket }; // class getOption - /** testing the methods: inline sal_Bool SAL_CALL setOption( oslSocketOption Option, void* pBuffer, @@ -2431,7 +2364,6 @@ namespace osl_Socket asAcceptorSocket.close( ); } - // LLA: // getSocketOption returns BufferLen, or -1 if something failed @@ -2550,8 +2482,6 @@ namespace osl_Socket }; // class setOption - - /** testing the method: inline sal_Bool SAL_CALL enableNonBlockingMode( sal_Bool bNonBlockingMode); */ @@ -2582,14 +2512,12 @@ namespace osl_Socket ( sal_True == bOK ) ); } - CPPUNIT_TEST_SUITE( enableNonBlockingMode ); CPPUNIT_TEST( enableNonBlockingMode_001 ); CPPUNIT_TEST_SUITE_END(); }; // class enableNonBlockingMode - /** testing the method: inline sal_Bool SAL_CALL isNonBlockingMode() const; */ @@ -2622,7 +2550,6 @@ namespace osl_Socket ( sal_False == bOK3 ) && ( sal_True == bOK4 ) ); } - CPPUNIT_TEST_SUITE( isNonBlockingMode ); CPPUNIT_TEST( isNonBlockingMode_001 ); CPPUNIT_TEST_SUITE_END(); @@ -2647,7 +2574,6 @@ namespace osl_Socket sHandle = NULL; } - void clearError_001() { ::osl::Socket sSocket(sHandle); @@ -2662,14 +2588,12 @@ namespace osl_Socket osl_Socket_E_None == sSocket.getError( ) && seBind != osl_Socket_E_None ); } - CPPUNIT_TEST_SUITE( clearError ); CPPUNIT_TEST( clearError_001 ); CPPUNIT_TEST_SUITE_END(); }; // class clearError - /** testing the methods: inline oslSocketError getError() const; inline ::rtl::OUString getErrorAsString( ) const; @@ -2689,7 +2613,6 @@ namespace osl_Socket sHandle = NULL; } - void getError_001() { ::osl::Socket sSocket(sHandle); @@ -2726,8 +2649,6 @@ namespace osl_Socket }; // class getError - - /** testing the methods: inline oslSocket getHandle() const; */ @@ -2772,10 +2693,6 @@ namespace osl_Socket }; // class getHandle - - - - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::ctors, "osl_Socket"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::operators, "osl_Socket"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::close, "osl_Socket"); @@ -2797,8 +2714,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getHandle, "osl_Socket"); } // namespace osl_Socket - - namespace osl_StreamSocket { @@ -2829,7 +2744,6 @@ namespace osl_StreamSocket sHandle = NULL; } - void ctors_none() { /// Socket constructor. @@ -3169,14 +3083,11 @@ protected: /**tester's comments: lack of a case that return sal_True, do not know when it will return sal_True*/ - CPPUNIT_TEST_SUITE( isExceptionPending ); CPPUNIT_TEST( isExPending_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isExceptionPending - - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::ctors, "osl_StreamSocket"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::send_recv, "osl_StreamSocket"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::shutdown, "osl_StreamSocket"); @@ -3184,7 +3095,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::isExceptionPending, "osl } // namespace osl_StreamSocket - namespace osl_ConnectorSocket { @@ -3223,7 +3133,6 @@ namespace osl_ConnectorSocket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -3241,7 +3150,6 @@ namespace osl_ConnectorSocket csConnectorSocket.close( ); } - void connect_001() { ::osl::SocketAddr saLocalSocketAddr( aHostIp1, IP_PORT_MYPORT2 ); @@ -3336,16 +3244,11 @@ namespace osl_ConnectorSocket }; // class connect - - - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::ctors, "osl_ConnectorSocket"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::connect, "osl_ConnectorSocket"); } // namespace osl_ConnectorSocket - - namespace osl_AcceptorSocket { @@ -3387,7 +3290,6 @@ namespace osl_AcceptorSocket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -3406,7 +3308,6 @@ namespace osl_AcceptorSocket csConnectorSocket.close( ); } - void listen_accept_001() { ::osl::SocketAddr saLocalSocketAddr( aHostIp1, IP_PORT_MYPORT3 ); @@ -3466,16 +3367,12 @@ namespace osl_AcceptorSocket }; // class listen_accept - - - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::ctors, "osl_AcceptorSocket"); //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::operator_assign, "osl_AcceptorSocket"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::listen_accept, "osl_AcceptorSocket"); } // namespace osl_AcceptorSocket - namespace osl_DatagramSocket { @@ -3498,7 +3395,6 @@ namespace osl_DatagramSocket osl_Socket_TypeDgram == dsSocket.getType( ) ); } - CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); CPPUNIT_TEST_SUITE_END(); @@ -3677,16 +3573,11 @@ public: }; // class sendTo_recvFrom - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom); } // namespace osl_DatagramSocket - - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index f8f005a5371e..33f928b82dce 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -67,10 +67,8 @@ using ::rtl::OUString; #define IP_PORT_MYPORT8 8896 #define IP_PORT_MYPORT9 8897 - // helper functions - // just used to test socket::close() when accepting class AcceptorThread : public Thread { @@ -145,7 +143,6 @@ namespace osl_Socket the use of C method lost some of the transparent of tester using C++ wrapper. */ - class ctors : public CppUnit::TestFixture { public: @@ -161,7 +158,6 @@ namespace osl_Socket sHandle = NULL; } - void ctors_none() { /// Socket constructor. @@ -222,8 +218,6 @@ namespace osl_Socket osl_Socket_TypeStream == sSocket.getType( ) ); } - - CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_none ); CPPUNIT_TEST( ctors_acquire ); @@ -236,7 +230,6 @@ namespace osl_Socket }; // class ctors - /** testing the methods: inline Socket& SAL_CALL operator= ( oslSocket socketHandle); inline Socket& SAL_CALL operator= (const Socket& sock); @@ -259,7 +252,6 @@ namespace osl_Socket sHandle = NULL; } - /** test writer's comment: the assignment operator does not support direct assinment like: @@ -333,7 +325,6 @@ namespace osl_Socket }; // class operators - /** testing the methods: inline void SAL_CALL shutdown( oslSocketDirection Direction = osl_Socket_DirReadWrite ); inline void SAL_CALL close(); @@ -354,7 +345,6 @@ namespace osl_Socket sHandle = NULL; } - void close_001() { ::osl::Socket sSocket(sHandle); @@ -446,14 +436,12 @@ namespace osl_Socket sal_True == bOK ); } - CPPUNIT_TEST_SUITE( getLocalAddr ); CPPUNIT_TEST( getLocalAddr_001 ); CPPUNIT_TEST_SUITE_END(); }; // class getLocalAddr - /** testing the method: inline sal_Int32 SAL_CALL getLocalPort() const; */ @@ -473,7 +461,6 @@ namespace osl_Socket sHandle = NULL; } - void getLocalPort_001() { ::osl::Socket sSocket(sHandle); @@ -546,7 +533,6 @@ namespace osl_Socket }; // class getLocalPort - /** testing the method: inline ::rtl::OUString SAL_CALL getLocalHost() const; @@ -570,7 +556,6 @@ namespace osl_Socket sHandle = NULL; } - void getLocalHost_001() { ::osl::Socket sSocket(sHandle); @@ -621,7 +606,6 @@ namespace osl_Socket }; // class getLocalHost - /** testing the methods: inline void SAL_CALL getPeerAddr( SocketAddr & Addr) const; inline sal_Int32 SAL_CALL getPeerPort() const; @@ -635,7 +619,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -653,7 +636,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void getPeer_001() { ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT ); @@ -684,19 +666,16 @@ namespace osl_Socket ( peerPort == saLocalSocketAddr.getPort( ) )); } - CPPUNIT_TEST_SUITE( getPeer ); CPPUNIT_TEST( getPeer_001 ); CPPUNIT_TEST_SUITE_END(); }; // class getPeer - /** testing the methods: inline sal_Bool SAL_CALL bind(const SocketAddr& LocalInterface); */ - class bind : public CppUnit::TestFixture { public: @@ -712,7 +691,6 @@ namespace osl_Socket sHandle = NULL; } - void bind_001() { ::osl::Socket sSocket(sHandle); @@ -750,7 +728,6 @@ namespace osl_Socket }; // class bind - /** testing the methods: inline sal_Bool SAL_CALL isRecvReady(const TimeValue *pTimeout = 0) const; @@ -763,7 +740,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -781,7 +757,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void isRecvReady_001() { ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT1 ); @@ -807,14 +782,12 @@ namespace osl_Socket ( sal_True == bOK3 ) ); } - CPPUNIT_TEST_SUITE( isRecvReady ); CPPUNIT_TEST( isRecvReady_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isRecvReady - /** testing the methods: inline sal_Bool SAL_CALL isSendReady(const TimeValue *pTimeout = 0) const; */ @@ -826,7 +799,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -844,7 +816,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void isSendReady_001() { ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT ); @@ -871,14 +842,12 @@ namespace osl_Socket ( sal_True == bOK3 ) ); } - CPPUNIT_TEST_SUITE( isSendReady ); CPPUNIT_TEST( isSendReady_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isSendReady - /** testing the methods: inline oslSocketType SAL_CALL getType() const; @@ -899,7 +868,6 @@ namespace osl_Socket sHandle = NULL; } - void getType_001() { sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp ); @@ -945,8 +913,6 @@ namespace osl_Socket }; // class getType - - /** testing the methods: inline sal_Int32 SAL_CALL getOption( oslSocketOption Option, @@ -1041,7 +1007,6 @@ namespace osl_Socket }; // class getOption - /** testing the methods: inline sal_Bool SAL_CALL setOption( oslSocketOption Option, void* pBuffer, @@ -1068,7 +1033,6 @@ namespace osl_Socket asAcceptorSocket.close( ); } - // LLA: // getSocketOption returns BufferLen, or -1 if something failed @@ -1188,8 +1152,6 @@ namespace osl_Socket }; // class setOption - - /** testing the method: inline sal_Bool SAL_CALL enableNonBlockingMode( sal_Bool bNonBlockingMode); */ @@ -1220,14 +1182,12 @@ namespace osl_Socket ( sal_True == bOK ) ); } - CPPUNIT_TEST_SUITE( enableNonBlockingMode ); CPPUNIT_TEST( enableNonBlockingMode_001 ); CPPUNIT_TEST_SUITE_END(); }; // class enableNonBlockingMode - /** testing the method: inline sal_Bool SAL_CALL isNonBlockingMode() const; */ @@ -1260,7 +1220,6 @@ namespace osl_Socket ( sal_False == bOK3 ) && ( sal_True == bOK4 ) ); } - CPPUNIT_TEST_SUITE( isNonBlockingMode ); CPPUNIT_TEST( isNonBlockingMode_001 ); CPPUNIT_TEST_SUITE_END(); @@ -1285,7 +1244,6 @@ namespace osl_Socket sHandle = NULL; } - void clearError_001() { ::osl::Socket sSocket(sHandle); @@ -1300,14 +1258,12 @@ namespace osl_Socket osl_Socket_E_None == sSocket.getError( ) && seBind != osl_Socket_E_None ); } - CPPUNIT_TEST_SUITE( clearError ); CPPUNIT_TEST( clearError_001 ); CPPUNIT_TEST_SUITE_END(); }; // class clearError - /** testing the methods: inline oslSocketError getError() const; inline ::rtl::OUString getErrorAsString( ) const; @@ -1327,7 +1283,6 @@ namespace osl_Socket sHandle = NULL; } - void getError_001() { ::osl::Socket sSocket(sHandle); @@ -1364,8 +1319,6 @@ namespace osl_Socket }; // class getError - - /** testing the methods: inline oslSocket getHandle() const; */ @@ -1410,10 +1363,6 @@ namespace osl_Socket }; // class getHandle - - - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::operators); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::close); @@ -1435,8 +1384,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getHandle); } // namespace osl_Socket - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx index 3a64cfc18551..6dc3fa462db5 100644 --- a/sal/qa/osl/socket/osl_SocketAddr.cxx +++ b/sal/qa/osl/socket/osl_SocketAddr.cxx @@ -48,7 +48,6 @@ #include #include - #include "sockethelper.hxx" using namespace osl; @@ -70,7 +69,6 @@ using ::rtl::OString; #define IP_PORT_MYPORT4 8885 //8892 #define IP_PORT_NETBIOS_DGM 138 - namespace osl_SocketAddr { @@ -215,7 +213,6 @@ namespace osl_SocketAddr }; // class ctors - /** testing the method: inline sal_Bool is() const; */ @@ -255,7 +252,6 @@ namespace osl_SocketAddr }; // class is - /** testing the method: inline ::rtl::OUString SAL_CALL getHostname( oslSocketResult *pResult = 0 ) const; */ @@ -330,7 +326,6 @@ namespace osl_SocketAddr CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } - CPPUNIT_TEST_SUITE( getHostname ); CPPUNIT_TEST( getHostname_001 ); CPPUNIT_TEST( getHostname_002 ); @@ -338,7 +333,6 @@ namespace osl_SocketAddr }; // class getHostname - /** testing the method: inline sal_Int32 SAL_CALL getPort() const; */ @@ -382,7 +376,6 @@ namespace osl_SocketAddr }; // class getPort - /** testing the method: inline sal_Bool SAL_CALL setPort( sal_Int32 nPort ); rfc1413.txt: TCP port numbers are from 1-65535 @@ -451,7 +444,6 @@ namespace osl_SocketAddr bOK == sal_False); } - CPPUNIT_TEST_SUITE( setPort ); CPPUNIT_TEST( setPort_001 ); CPPUNIT_TEST( setPort_002 ); @@ -461,7 +453,6 @@ namespace osl_SocketAddr }; // class setPort - /** tester comment: In the following two functions, it use ::rtl::ByteSequence as an intermediate storage for address, @@ -471,7 +462,6 @@ namespace osl_SocketAddr so may be a sal_uInt8 array is better. */ - /** testing the method: inline sal_Bool SAL_CALL setAddr( const ::rtl::ByteSequence & address ); */ @@ -494,14 +484,12 @@ namespace osl_SocketAddr sal_True == bOK ); } - CPPUNIT_TEST_SUITE( setAddr ); CPPUNIT_TEST( setAddr_001 ); CPPUNIT_TEST_SUITE_END( ); }; // class setAddr - /** testing the method: inline ::rtl::ByteSequence SAL_CALL getAddr( oslSocketResult *pResult = 0 ) const; */ @@ -531,7 +519,6 @@ namespace osl_SocketAddr }; // class getAddr - /** testing the methods: inline SocketAddr & SAL_CALL operator= (oslSocketAddr Addr); inline SocketAddr & SAL_CALL operator= (const SocketAddr& Addr); @@ -560,7 +547,6 @@ namespace osl_SocketAddr sal_True == bOK ); } - void operator_equal_002() { ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.199"), IP_PORT_TELNET); @@ -650,8 +636,6 @@ namespace osl_SocketAddr }; // class operator_equal - - /** testing the method: inline oslSocketAddr SAL_CALL getHandle() const; */ @@ -691,7 +675,6 @@ namespace osl_SocketAddr }; // class getSocketAddrHandle - /** testing the method: static inline ::rtl::OUString SAL_CALL getLocalHostname( oslSocketResult *pResult = 0); */ @@ -745,7 +728,6 @@ namespace osl_SocketAddr }; // class getLocalHostname - /** testing the method: static inline void SAL_CALL resolveHostname( const ::rtl::OUString & strHostName , SocketAddr & Addr ); */ @@ -773,7 +755,6 @@ namespace osl_SocketAddr }; // class resolveHostname - /** testing the method: static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, @@ -850,9 +831,6 @@ namespace osl_SocketAddr }; // class getFamilyOfSocketAddr - - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::is); //TODO: enable Test with valid host names @@ -870,8 +848,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getFamilyOfSocketAddr); } // namespace osl_SocketAddr - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index df7d21e89b2c..768d76eb5802 100644 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -64,26 +64,20 @@ extern "C" # include #endif - - // macro definition for the ASCII array/OUString declarations, // we use p### for the ASCII array, // a### for the OUString, // n###Len for its length - #define OSLTEST_DECLARE( str_name, str_value ) \ static const sal_Char p##str_name[] = str_value; \ static const sal_Int32 n##str_name##Len = sizeof( p##str_name ) -1; \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( p##str_name ) - - // Ip version definition #define IP_VER 4 /// currently only IPv4 is considered. - // Hostnames. // OSLTEST_DECLARE( HostName1, "localhost" ); @@ -103,7 +97,6 @@ OSLTEST_DECLARE( HostIpInval, "123.45.67.89" ); //this is valid ip number,bu OSLTEST_DECLARE( HostNameInval, "www.the_hostname_that_can_not_resolvable_to_an_IP_Address.com" ); OSLTEST_DECLARE( HostIpZero, "0.0.0.0" ); - // OS independent file definition OSLTEST_DECLARE( NullURL, "" ); diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h index ff8ece1ca7b3..43f91d07c6d9 100644 --- a/sal/qa/osl/socket/osl_Socket_Const_orig.h +++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h @@ -64,26 +64,20 @@ extern "C" # include #endif - - // macro definition for the ASCII array/OUString declarations, // we use p### for the ASCII array, // a### for the OUString, // n###Len for its length - #define OSLTEST_DECLARE( str_name, str_value ) \ static const sal_Char p##str_name[] = str_value; \ static const sal_Int32 n##str_name##Len = sizeof( p##str_name ) -1; \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( p##str_name ) - - // Ip version definition #define IP_VER 4 /// currently only IPv4 is considered. - // Ip port definition #define IP_PORT_ZERO 0 @@ -114,7 +108,6 @@ extern "C" #define IP_PORT_TMP 9999 #define IP_PORT_INVAL 99999 - // service definitions. OSLTEST_DECLARE( ServiceFTP, "ftp" ); @@ -124,13 +117,11 @@ OSLTEST_DECLARE( ServiceIMAP, "imap" ); OSLTEST_DECLARE( ServiceHTTPS, "https" ); OSLTEST_DECLARE( ServiceNETBIOS, "netbios-dgm" ); - // protocol definitions. OSLTEST_DECLARE( ProtocolTCP, "tcp" ); OSLTEST_DECLARE( ProtocolUDP, "udp" ); - // Hostnames. OSLTEST_DECLARE( HostName1, "localhost" ); @@ -150,7 +141,6 @@ OSLTEST_DECLARE( HostIpInval1, "123.345.67.89" ); //this is real invalid ip nu OSLTEST_DECLARE( HostNameInval, "www.the_hostname_that_can_not_resolvable_to_an_IP_Address.com" ); OSLTEST_DECLARE( HostIpZero, "0.0.0.0" ); - // OS independent file definition OSLTEST_DECLARE( NullURL, "" ); diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx index 21384786e83b..2262f40177b3 100644 --- a/sal/qa/osl/socket/osl_Socket_tests.cxx +++ b/sal/qa/osl/socket/osl_Socket_tests.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // include files #include @@ -30,11 +29,8 @@ // helper functions - - // tests cases begins here - namespace osl_Socket { @@ -58,9 +54,6 @@ namespace osl_Socket CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::tests); } - - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx index 0d1e56d40547..d99753cf6763 100644 --- a/sal/qa/osl/socket/osl_StreamSocket.cxx +++ b/sal/qa/osl/socket/osl_StreamSocket.cxx @@ -62,10 +62,8 @@ using ::rtl::OString; const char * pTestString1 = "test socket"; const char * pTestString2 = " Passed#OK"; - // helper functions - // just used to test socket::close() when accepting class AcceptorThread : public Thread { @@ -256,7 +254,6 @@ public: }; - // Helper functions, to create buffers, check buffers class ValueCheckProvider { @@ -309,7 +306,6 @@ public: }; - /** Client Socket Thread, served as a temp little client to communicate with server. */ @@ -487,8 +483,6 @@ public: } }; - - namespace osl_StreamSocket { @@ -519,7 +513,6 @@ namespace osl_StreamSocket sHandle = NULL; } - void ctors_none() { /// Socket constructor. @@ -692,8 +685,6 @@ namespace osl_StreamSocket CPPUNIT_TEST_SUITE_END(); }; // class send_recv - - class SendClientThread : public Thread { protected: @@ -891,13 +882,11 @@ namespace osl_StreamSocket /**tester's comments: lack of a case that return sal_True, do not know when it will return sal_True*/ - CPPUNIT_TEST_SUITE( isExceptionPending ); CPPUNIT_TEST( isExPending_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isExceptionPending - /** Client Socket Thread, served as a temp little client to communicate with server. */ @@ -943,12 +932,10 @@ namespace osl_StreamSocket pTimeout->Seconds = 20; pTimeout->Nanosec = 0; - // blocking mode, if read/recv failed, block until success t_print("enableNonBlockingMode(false)\n"); aSocket.enableNonBlockingMode( sal_False ); - t_print("connect()\n"); oslSocketResult eResult = aSocket.connect( aSocketAddr, pTimeout ); if ( osl_Socket_Ok == eResult) @@ -1017,8 +1004,6 @@ namespace osl_StreamSocket }; - - class justtest : public CppUnit::TestFixture { void send_Acceptor(rtl::OString const& _sAddr, osl::Condition &) @@ -1039,7 +1024,6 @@ namespace osl_StreamSocket rtl::OUString aHostname = aSocketAddr.getHostname(); aSocketAddr.getPort(); - //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket aSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); @@ -1075,8 +1059,6 @@ namespace osl_StreamSocket aSocket.close(); } - - void send_Connector(rtl::OString const& _sAddr, osl::Condition &/*_aCondition*/ ) { ::osl::ConnectorSocket aSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); @@ -1129,7 +1111,6 @@ namespace osl_StreamSocket aSocket.close(); } - public: // LLA: send_Connector_2_margritte works, it send strings to echo server on margritte // but can not receive anything @@ -1178,8 +1159,6 @@ namespace osl_StreamSocket send_Connector_2_margritte(sAddr); } - - void send_recv() { rtl::OString sAddr; @@ -1263,7 +1242,6 @@ namespace osl_StreamSocket } } - void getPage(rtl::OString const& _sAddr); void test_getPage() { @@ -1280,7 +1258,6 @@ namespace osl_StreamSocket CPPUNIT_TEST_SUITE_END(); }; // class isExceptionPending - void justtest::getPage(rtl::OString const& _sAddr) { rtl::OUString suAddr = rtl::OUString::createFromAscii(_sAddr.getStr()); @@ -1349,7 +1326,6 @@ namespace osl_StreamSocket sal_Int32 nBufferSize = strlen(pBuffer); ssStreamConnection.write( pBuffer, nBufferSize ); - char *pBufferPeek = (char*) malloc(1024); sal_Int32 nReadNumber = 1; while ( nReadNumber != 0) @@ -1372,8 +1348,6 @@ namespace osl_StreamSocket aSocket.close(); } - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::send_recv); // CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::shutdown); @@ -1383,8 +1357,6 @@ namespace osl_StreamSocket } // namespace osl_StreamSocket - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index 3f822fa46d42..3057c350f3a0 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.cxx @@ -35,15 +35,12 @@ # define t_print printf #endif - // Ip version definition #define IP_VER 4 /// currently only IPv4 is considered. - // helper functions - /** compare two OUString. */ sal_Bool compareUString( const ::rtl::OUString & ustr1, const ::rtl::OUString & ustr2 ) diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx index 4c45369d3eaf..b4698077971a 100644 --- a/sal/qa/osl/socket/sockethelper.hxx +++ b/sal/qa/osl/socket/sockethelper.hxx @@ -40,7 +40,6 @@ extern "C" { #endif - // OS dependent declaration and includes #if ( defined UNX ) //Unix diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx index 9bf2716266be..b0f58a63c613 100644 --- a/sal/qa/rtl/alloc/rtl_alloc.cxx +++ b/sal/qa/rtl/alloc/rtl_alloc.cxx @@ -134,12 +134,10 @@ public: CPPUNIT_TEST_SUITE_END(); }; - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::Memory); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::TestZeroMemory); } // namespace rtl_alloc - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index 4e39fbdf7095..a80d10850e4e 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // Documentation about bootstraping can be found at: // http://udk.openoffice.org/common/man/concept/micro_deployment.html @@ -92,7 +91,6 @@ inline ::rtl::OUString getModulePath( void ) #define TESTSHL2_INI "testshl2" #define PSEUDO_INI "pseudo" - static rtl::OUString getExecutableDirectory() { rtl::OUString fileName; @@ -106,7 +104,6 @@ static rtl::OUString getExecutableDirectory() return aDirURL; } - // get the URL of testshl2rc/rtlrc/pseudorc inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename) { @@ -135,8 +132,6 @@ void thread_sleep_tenth_sec(sal_Int32 _nTenthSec) #endif } - - namespace rtl_Bootstrap { class ctor : public CppUnit::TestFixture @@ -767,8 +762,6 @@ namespace rtl_Bootstrap } // namespace rtl_Bootstrap - - static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString const& _sContent) { osl::File::remove(_suFileURL); @@ -800,7 +793,6 @@ static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString co OSL_ASSERT(t_fileExist(_suFileURL) == true); } - static void create_rtlrc() { rtl::OUString aFileURL(getExecutableDirectory()); @@ -823,7 +815,6 @@ static void create_rtlrc() removeAndCreateFile(aFileURL, sLines); } - static void create_testshl2rc() { rtl::OUString aFileURL(getExecutableDirectory()); @@ -862,8 +853,6 @@ static void create_testshl2rc() SAL_CONFIGFILE("rtl")); } - - static void create_pseudorc() { rtl::OUString aFileURL(getExecutableDirectory()); @@ -880,7 +869,6 @@ static void create_pseudorc() removeAndCreateFile(aFileURL, sLines); } - void create_bootstrap_processrc() { rtl::OUString aDirURL(getModulePath()); @@ -897,7 +885,6 @@ void create_bootstrap_processrc() removeAndCreateFile(aDirURL, sLines); } - void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc) { (void) _pFunc; diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index 9a71bb568bd7..0f713738e8cf 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -27,7 +27,6 @@ #include #include - namespace rtl_cipher { @@ -103,7 +102,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class create - class createBF : public CppUnit::TestFixture { public: @@ -605,8 +603,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class initBF - - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::create); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::createBF); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::decode); @@ -620,9 +616,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::initBF); } // namespace rtl_cipher - - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx index 81a507b33f0e..ad7dff456b9f 100644 --- a/sal/qa/rtl/crc32/rtl_crc32.cxx +++ b/sal/qa/rtl/crc32/rtl_crc32.cxx @@ -39,7 +39,6 @@ public: { } - // insert your test code here. void rtl_crc32_001() { @@ -143,8 +142,6 @@ public: CPPUNIT_ASSERT_MESSAGE("checksum should differ", nCRC1 != nCRC2); } - - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -159,13 +156,9 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class test - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_CRC32::test); } // namespace rtl_CRC32 - - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index 6745ee210be9..94d18b87c283 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -151,7 +151,6 @@ public: rtl_digest_destroy( handle ); } - handle = rtl_digest_create( rtl_Digest_AlgorithmInvalid ); nAlgoLength = rtl_digest_queryLength(handle); CPPUNIT_ASSERT_MESSAGE("query length", 0 == nAlgoLength); diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index 1a8912bbcd91..6c4227efc2cc 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // include files #include @@ -39,7 +38,6 @@ #include #endif - #define CONST_TEST_STRING "gregorian" namespace { @@ -50,7 +48,6 @@ struct Gregorian : public rtl::StaticWithInit { }; } - namespace ThreadHelper { // typedef enum { @@ -81,8 +78,6 @@ namespace ThreadHelper } } - - /** Simple thread for testing Thread-create. * Just add 1 of value 0, and after running, result is 1. */ @@ -142,7 +137,6 @@ public: } }; - namespace rtl_DoubleLocking { @@ -162,7 +156,6 @@ namespace rtl_DoubleLocking { } - void getValue_001() { rtl::OUString aStr = Gregorian::get(); diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index ecfc08a0237e..ef8d7e31a656 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -63,7 +63,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getDefault - class setDefault : public CppUnit::TestFixture { public: @@ -98,7 +97,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class setDefault - class getLanguage : public CppUnit::TestFixture { public: @@ -137,7 +135,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getLanguage - class getCountry : public CppUnit::TestFixture { public: @@ -176,7 +173,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getCountry - class getVariant : public CppUnit::TestFixture { public: @@ -215,7 +211,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getVariant - class hashCode : public CppUnit::TestFixture { public: @@ -254,7 +249,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class hashCode - class equals : public CppUnit::TestFixture { public: @@ -300,7 +294,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class equals - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::getDefault); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::setDefault); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::getLanguage); @@ -310,9 +303,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::hashCode); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::equals); } // namespace rtl_locale - - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx index 460d001be5fc..374f9c3ca48b 100644 --- a/sal/qa/rtl/logfile/rtl_logfile.cxx +++ b/sal/qa/rtl/logfile/rtl_logfile.cxx @@ -92,8 +92,6 @@ inline ::rtl::OUString getCurrentPID( ) return ( ::rtl::OUString::valueOf( ( long )nPID ) ); } - - /* * LLA: * check if logfile is create @@ -186,7 +184,6 @@ namespace rtl_logfile // TODO: assertion test! } - CPPUNIT_TEST_SUITE( logfile ); CPPUNIT_TEST( logfile_001 ); CPPUNIT_TEST( logfile_002 ); @@ -196,10 +193,8 @@ namespace rtl_logfile } // namespace rtl_logfile - CPPUNIT_TEST_SUITE_REGISTRATION( rtl_logfile::logfile); - CPPUNIT_PLUGIN_IMPLEMENT(); //~ do some clean up work after all test completed. @@ -235,6 +230,4 @@ public: GlobalObject theGlobalObject; - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx index e0fd0a26a40f..5c7605758b09 100644 --- a/sal/qa/rtl/ostring/rtl_OString2.cxx +++ b/sal/qa/rtl/ostring/rtl_OString2.cxx @@ -173,7 +173,6 @@ public: valueOf_double_test(nValue); } - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -198,7 +197,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class valueOf - // - toDouble (tests) class toDouble : public CppUnit::TestFixture @@ -211,8 +209,6 @@ public: // testPrecision a; } - - // initialise your test code values here. void setUp() { @@ -351,7 +347,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class toDouble - // - getToken (tests) class getToken : public CppUnit::TestFixture @@ -368,8 +363,6 @@ public: { } - - void getToken_000() { rtl::OString sTokenStr; @@ -453,7 +446,6 @@ public: CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1); } - CPPUNIT_TEST_SUITE(getToken); CPPUNIT_TEST(getToken_000); CPPUNIT_TEST(getToken_001); @@ -463,11 +455,9 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getToken - // testing the method replaceAt( sal_Int32 index, sal_Int32 count, // const OString& newStr ) - // Developer note: Mindy Liu, 2004-04-23 // stollen from sal/qa/rtl_strings/rtl_OString.cxx @@ -495,7 +485,6 @@ public: return bRes; } - void replaceAt_001() { sal_Bool bRes = check_replaceAt(new rtl::OString("Java@Sun"), @@ -532,7 +521,6 @@ public: CPPUNIT_ASSERT_MESSAGE("replace with null string", bRes == sal_True); } - CPPUNIT_TEST_SUITE(replaceAt); CPPUNIT_TEST(replaceAt_001); CPPUNIT_TEST(replaceAt_002); @@ -542,8 +530,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class replaceAt - - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::valueOf); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::toDouble); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::getToken); @@ -551,9 +537,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::replaceAt); } // namespace rtl_OString - - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx index 2f871da395ab..116191d353c4 100644 --- a/sal/qa/rtl/ostring/rtl_str.cxx +++ b/sal/qa/rtl/ostring/rtl_str.cxx @@ -82,7 +82,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare - class compareIgnoreAsciiCase : public CppUnit::TestFixture { public: @@ -147,8 +146,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compareIgnoreAsciiCase - - class shortenedCompareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { public: @@ -231,9 +228,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare - - - class hashCode : public CppUnit::TestFixture { public: @@ -285,9 +279,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare - - - class indexOfChar : public CppUnit::TestFixture { public: @@ -333,7 +324,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare - class lastIndexOfChar : public CppUnit::TestFixture { public: @@ -379,9 +369,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOfChar - - - class indexOfStr : public CppUnit::TestFixture { public: @@ -433,8 +420,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare - - class lastIndexOfStr : public CppUnit::TestFixture { public: @@ -497,8 +482,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOfStr - - class replaceChar : public CppUnit::TestFixture { public: @@ -533,8 +516,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - class replaceChar_WithLength : public CppUnit::TestFixture { public: @@ -574,9 +555,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - - class toAsciiLowerCase : public CppUnit::TestFixture { public: @@ -611,7 +589,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - class toAsciiLowerCase_WithLength : public CppUnit::TestFixture { public: @@ -647,8 +624,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - class toAsciiUpperCase : public CppUnit::TestFixture { public: @@ -683,7 +658,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - class toAsciiUpperCase_WithLength : public CppUnit::TestFixture { public: @@ -719,9 +693,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - - class trim_WithLength : public CppUnit::TestFixture { public: @@ -822,8 +793,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; - - class valueOfChar : public CppUnit::TestFixture { public: @@ -854,7 +823,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::compare); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::compareIgnoreAsciiCase); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::shortenedCompareIgnoreAsciiCase_WithLength); @@ -878,8 +846,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::valueOfChar); } // namespace rtl_str - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx index a8b2244217ad..4a92cffb8f8f 100644 --- a/sal/qa/rtl/ostring/rtl_string.cxx +++ b/sal/qa/rtl/ostring/rtl_string.cxx @@ -60,8 +60,6 @@ namespace rtl_string CPPUNIT_TEST_SUITE_END(); }; // class getLength - - class newFromString : public CppUnit::TestFixture { public: @@ -94,8 +92,6 @@ namespace rtl_string CPPUNIT_TEST_SUITE_END(); }; // class newFromString - - class convertUStringToString : public CppUnit::TestFixture { public: @@ -148,8 +144,6 @@ namespace rtl_string CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Tsch\xFC\xDF")) == sal_True); } - - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -162,17 +156,12 @@ namespace rtl_string CPPUNIT_TEST_SUITE_END(); }; // class convertUStringToString - - } // namespace rtl_string - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::getLength); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::newFromString); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::convertUStringToString); - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index 7e6721160546..0628d504d9c7 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // autogenerated file with codegen.pl #include @@ -212,7 +211,6 @@ public: number_double_test(nValue); } - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -237,7 +235,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class number - // testing the method toDouble() template @@ -246,7 +243,6 @@ sal_Int16 SAL_CALL checkPrecisionSize() // sal_Int16 nSize = sizeof(T); volatile T nCalcValue = 1.0; - // (i + 1) is the current precision // numerical series // 1.1 @@ -310,7 +306,6 @@ sal_Int16 SAL_CALL checkPrecisionSize() return i; } - class testPrecision { public: @@ -672,7 +667,6 @@ public: CPPUNIT_ASSERT_MESSAGE("expected position is wrong", nPos == _nExpectedResultPos); } - void lastIndexOf_test_oustring_offset_001() { // search for sun, start at the end, found (pos==0) @@ -846,7 +840,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOf - // - getToken (tests) class getToken : public CppUnit::TestFixture { @@ -1248,8 +1241,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OUString::convertFromString); } // namespace rtl_OUString - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx index b2a93d1901e1..bbf62f515ca5 100644 --- a/sal/qa/rtl/oustring/rtl_ustr.cxx +++ b/sal/qa/rtl/oustring/rtl_ustr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -35,7 +34,6 @@ inline void printOUString( ::rtl::OUString const & _suStr ) } */ - namespace rtl_ustr { @@ -43,7 +41,6 @@ namespace rtl_ustr { public: - void compare_000() { rtl_ustr_compare( NULL, NULL); @@ -96,7 +93,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class compare - class compareIgnoreAsciiCase : public CppUnit::TestFixture { public: @@ -161,8 +157,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class compareIgnoreAsciiCase - - class shortenedCompareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { public: @@ -245,7 +239,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class compare - // // // class hashCode : public CppUnit::TestFixture @@ -300,9 +293,6 @@ namespace rtl_ustr // CPPUNIT_TEST_SUITE_END(); // }; // class compare - - - class indexOfChar : public CppUnit::TestFixture { public: @@ -348,7 +338,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class indexOfChar - class lastIndexOfChar : public CppUnit::TestFixture { public: @@ -394,9 +383,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOfChar - - - class indexOfStr : public CppUnit::TestFixture { public: @@ -453,8 +439,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class compare - - class lastIndexOfStr : public CppUnit::TestFixture { public: @@ -517,8 +501,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOfStr - - class replaceChar : public CppUnit::TestFixture { public: @@ -556,8 +538,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - class replaceChar_WithLength : public CppUnit::TestFixture { public: @@ -617,9 +597,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - - class toAsciiLowerCase : public CppUnit::TestFixture { public: @@ -657,7 +634,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - class toAsciiLowerCase_WithLength : public CppUnit::TestFixture { public: @@ -700,8 +676,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - class toAsciiUpperCase : public CppUnit::TestFixture { public: @@ -739,7 +713,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - class toAsciiUpperCase_WithLength : public CppUnit::TestFixture { public: @@ -777,9 +750,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - - class trim_WithLength : public CppUnit::TestFixture { public: @@ -814,7 +784,6 @@ namespace rtl_ustr free(pStr); } - void trim_WithLength_002() { rtl::OUString suStr("trim this"); @@ -829,7 +798,6 @@ namespace rtl_ustr free(pStr); } - void trim_WithLength_003() { rtl::OUString suStr(" trim this"); @@ -887,8 +855,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; - - class valueOfChar : public CppUnit::TestFixture { public: @@ -919,9 +885,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; - - - class ascii_compare_WithLength : public CppUnit::TestFixture { public: @@ -1000,9 +963,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; - - - class ascii_shortenedCompareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { public: @@ -1067,8 +1027,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_shortenedCompareIgnoreAsciiCase_WithLength - - class ascii_compareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { public: @@ -1133,8 +1091,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_compareIgnoreAsciiCase_WithLength - - class ascii_compare : public CppUnit::TestFixture { public: @@ -1191,8 +1147,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_compare - - class ascii_compareIgnoreAsciiCase : public CppUnit::TestFixture { public: @@ -1279,7 +1233,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_compareIgnoreAsciiCase - // sample out of inc/rtl/ustring.hxx // rtl_uString * pToken = NULL; // sal_Int32 nIndex = 0; @@ -1377,7 +1330,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_compareIgnoreAsciiCase - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ustr::compare); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ustr::compareIgnoreAsciiCase); @@ -1409,11 +1361,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ustr::ascii_shortenedCompareIgnoreAsciiCase_ } // namespace rtl_ustr - - // this macro creates an empty function, which will called by the RegisterAllFunctions("") // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/process/child_process.cxx b/sal/qa/rtl/process/child_process.cxx index f7d38ae0f8c3..344a25f71a3b 100644 --- a/sal/qa/rtl/process/child_process.cxx +++ b/sal/qa/rtl/process/child_process.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include "sal/main.h" #include diff --git a/sal/qa/rtl/process/child_process_id.cxx b/sal/qa/rtl/process/child_process_id.cxx index dd8c6e30af09..17f330fa703f 100644 --- a/sal/qa/rtl/process/child_process_id.cxx +++ b/sal/qa/rtl/process/child_process_id.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include "sal/main.h" #include diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index c17a45b344d9..0bd9c70e5078 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -147,7 +146,6 @@ public: delete pInfo; } - CPPUNIT_TEST_SUITE(getAppCommandArg); CPPUNIT_TEST(getAppCommandArg_001); // CPPUNIT_TEST(getAppCommandArg_002); @@ -281,7 +279,6 @@ public: CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Process::getAppCommandArg, "rtl_Process"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Process::getGlobalProcessId, "rtl_Process"); - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h index 71f4ae7dbb68..8abffb2d7a96 100644 --- a/sal/qa/rtl/process/rtl_Process_Const.h +++ b/sal/qa/rtl/process/rtl_Process_Const.h @@ -20,7 +20,6 @@ #ifndef _RTL_PROCESS_CONST_H_ #define _RTL_PROCESS_CONST_H_ - #include using namespace ::rtl; @@ -35,7 +34,6 @@ extern "C" ::rtl::OUString suParam2(RTL_CONSTASCII_USTRINGPARAM("-child")); ::rtl::OUString suParam3(RTL_CONSTASCII_USTRINGPARAM("-process")); - #ifdef __cplusplus } #endif diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx index f9606d4d778f..752769fe782b 100644 --- a/sal/qa/rtl/random/rtl_random.cxx +++ b/sal/qa/rtl/random/rtl_random.cxx @@ -68,7 +68,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class createPool - class destroyPool : public CppUnit::TestFixture { public: @@ -107,7 +106,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class destroyPool - class addBytes : public CppUnit::TestFixture { public: @@ -161,7 +159,6 @@ public: delete [] pBuffer; } - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -172,7 +169,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class addBytes - class Statistics { int m_nDispensation[256]; @@ -394,7 +390,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getBytes - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::createPool); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::destroyPool); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::addBytes); diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx index bb64f4b9c10d..45ce5912f125 100644 --- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx +++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -467,8 +466,6 @@ namespace CPPUNIT_TEST_SUITE_END( ); }; - - class testBestUnix : public CppUnit::TestFixture { public: diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index 3c7742212d11..92e247de8a5d 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sal/config.h" #include diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx index e8c4e764b72c..7465215a1d7b 100644 --- a/sal/qa/rtl/uri/rtl_Uri.cxx +++ b/sal/qa/rtl/uri/rtl_Uri.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -28,12 +27,9 @@ #include #include - - namespace Stringtest { - class Convert : public CppUnit::TestFixture { rtl::OUString m_aStr; @@ -170,7 +166,6 @@ namespace Stringtest return sType; } - void test_UTF8_files() { #ifdef UNX @@ -240,7 +235,6 @@ namespace Stringtest } - CPPUNIT_TEST_SUITE_REGISTRATION( Stringtest::Convert ); // LLA: doku anpassen!!! diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index fce4aa5d0c5d..de239a4acaf4 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "rtl/strbuf.hxx" #include "rtl/uri.hxx" #include "rtl/ustrbuf.hxx" diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx index 5b756013e723..56c3e41e8f4c 100644 --- a/sal/qa/rtl/uuid/rtl_Uuid.cxx +++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -204,11 +203,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_Uuid::createUuid); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_Uuid::createNamedUuid); } // namespace rtl_Uuid - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx index 22069c9acbe7..d4d4db492403 100644 --- a/sal/qa/systools/test_comtools.cxx +++ b/sal/qa/systools/test_comtools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // autogenerated file with codegen.pl #include @@ -228,12 +227,10 @@ namespace test_comtools CPPUNIT_TEST_SUITE_END(); }; - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_comtools::test_COMReference, "test_comtools"); } // namespace rtl_OUString - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. NOADDITIONAL; diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx index 500f04d2ab28..f28cdc140d49 100644 --- a/sal/rtl/alloc_arena.cxx +++ b/sal/rtl/alloc_arena.cxx @@ -47,7 +47,6 @@ struct rtl_arena_list_st static rtl_arena_list_st g_arena_list; - /** gp_arena_arena * provided for arena_type allocations, and hash_table resizing. * @@ -55,7 +54,6 @@ static rtl_arena_list_st g_arena_list; */ static rtl_arena_type * gp_arena_arena = 0; - /** gp_machdep_arena * * Low level virtual memory (pseudo) arena @@ -88,7 +86,6 @@ SAL_CALL rtl_machdep_free ( sal_Size rtl_machdep_pagesize(); - /* ================================================================= */ /** rtl_arena_segment_constructor() @@ -104,7 +101,6 @@ rtl_arena_segment_constructor (void * obj) return (1); } - /** rtl_arena_segment_destructor() */ void @@ -159,7 +155,6 @@ rtl_arena_segment_populate ( return (span != 0); } - /** rtl_arena_segment_get() * * @precond arena->m_lock acquired. @@ -213,7 +208,6 @@ rtl_arena_segment_put ( (*ppSegment) = 0; } - /** rtl_arena_freelist_insert() * * @precond arena->m_lock acquired. @@ -332,7 +326,6 @@ rtl_arena_hash_rescale ( } } - /** rtl_arena_hash_insert() * ...and update stats. */ @@ -475,7 +468,6 @@ dequeue_and_leave: return (*ppSegment != 0); } - /** rtl_arena_segment_create() * import new (span) segment from source arena * @@ -530,7 +522,6 @@ rtl_arena_segment_create ( return (0); } - /** rtl_arena_segment_coalesce() * mark as free and join with adjacent free segment(s) * @@ -628,7 +619,6 @@ rtl_arena_constructor (void * obj) arena->m_hash_shift = highbit(arena->m_hash_size) - 1; } - /** rtl_arena_destructor() */ void @@ -1194,7 +1184,6 @@ SAL_CALL rtl_machdep_free ( #endif /* (SAL_UNX || SAL_W32) */ } - sal_Size rtl_machdep_pagesize() { diff --git a/sal/rtl/alloc_arena.hxx b/sal/rtl/alloc_arena.hxx index 282d9f29a5e6..69aa1897866e 100644 --- a/sal/rtl/alloc_arena.hxx +++ b/sal/rtl/alloc_arena.hxx @@ -36,7 +36,6 @@ struct rtl_arena_stat_type sal_Size m_mem_alloc; }; - /** rtl_arena_segment_type * @internal */ @@ -61,7 +60,6 @@ struct rtl_arena_segment_type sal_Size m_type; }; - /** rtl_arena_type * @internal */ @@ -107,7 +105,6 @@ struct rtl_arena_st rtl_cache_type ** m_qcache_ptr; }; - /** gp_default_arena * default arena with pagesize quantum * diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx index e4ca6c9706f7..19591a89870c 100644 --- a/sal/rtl/alloc_cache.cxx +++ b/sal/rtl/alloc_cache.cxx @@ -57,7 +57,6 @@ struct rtl_cache_list_st static rtl_cache_list_st g_cache_list; - /** gp_cache_arena * provided for cache_type allocations, and hash_table resizing. * @@ -65,25 +64,21 @@ static rtl_cache_list_st g_cache_list; */ static rtl_arena_type * gp_cache_arena = 0; - /** gp_cache_magazine_cache * @internal */ static rtl_cache_type * gp_cache_magazine_cache = 0; - /** gp_cache_slab_cache * @internal */ static rtl_cache_type * gp_cache_slab_cache = 0; - /** gp_cache_bufctl_cache * @internal */ static rtl_cache_type * gp_cache_bufctl_cache = 0; - /* ================================================================= */ /** RTL_CACHE_HASH_INDEX() @@ -234,7 +229,6 @@ rtl_cache_hash_remove ( #define RTL_CACHE_SLAB(addr, size) \ (((rtl_cache_slab_type*)(RTL_MEMORY_P2END((sal_uIntPtr)(addr), (size)))) - 1) - /** rtl_cache_slab_constructor() */ int @@ -248,7 +242,6 @@ rtl_cache_slab_constructor (void * obj, SAL_UNUSED_PARAMETER void *) return (1); } - /** rtl_cache_slab_destructor() */ void @@ -260,7 +253,6 @@ rtl_cache_slab_destructor (void * obj, SAL_UNUSED_PARAMETER void *) (void) slab; // avoid warnings } - /** rtl_cache_slab_create() * * @precond cache->m_slab_lock released. @@ -308,7 +300,6 @@ rtl_cache_slab_create ( return (slab); } - /** rtl_cache_slab_destroy() * * @precond cache->m_slab_lock released. @@ -354,7 +345,6 @@ rtl_cache_slab_destroy ( } } - /** rtl_cache_slab_populate() * * @precond cache->m_slab_lock acquired. @@ -474,7 +464,6 @@ rtl_cache_slab_alloc ( return (addr); } - /** rtl_cache_slab_free() * * Return a buffer to slab layer; used by magazine layer. @@ -559,7 +548,6 @@ rtl_cache_magazine_constructor (void * obj, SAL_UNUSED_PARAMETER void *) return (1); } - /** rtl_cache_magazine_destructor() */ void @@ -572,7 +560,6 @@ rtl_cache_magazine_destructor (void * obj, SAL_UNUSED_PARAMETER void *) (void) mag; // avoid warnings } - /** rtl_cache_magazine_clear() */ void @@ -1304,7 +1291,6 @@ SAL_CALL rtl_cache_free ( static void rtl_cache_wsupdate_init(); - /** rtl_cache_wsupdate_wait() * * @precond g_cache_list.m_lock acquired diff --git a/sal/rtl/alloc_cache.hxx b/sal/rtl/alloc_cache.hxx index 877ec82ce37f..01db4b2dd1cb 100644 --- a/sal/rtl/alloc_cache.hxx +++ b/sal/rtl/alloc_cache.hxx @@ -36,7 +36,6 @@ struct rtl_cache_stat_type sal_Size m_mem_alloc; }; - /** rtl_cache_bufctl_type * @internal */ @@ -48,7 +47,6 @@ struct rtl_cache_bufctl_type sal_uIntPtr m_slab; /* parent slab address */ }; - /** rtl_cache_slab_type * @internal */ @@ -64,7 +62,6 @@ struct rtl_cache_slab_type rtl_cache_bufctl_type * m_sp; /* free buffer linkage 'stack pointer' */ }; - /** rtl_cache_magazine_type * @internal */ @@ -80,7 +77,6 @@ struct rtl_cache_magazine_type void * m_objects[RTL_CACHE_MAGAZINE_SIZE]; }; - /** rtl_cache_depot_type * @internal */ @@ -95,7 +91,6 @@ struct rtl_cache_depot_type sal_Size m_prev_min; }; - /** rtl_cache_type * @internal */ diff --git a/sal/rtl/alloc_impl.hxx b/sal/rtl/alloc_impl.hxx index 4101df76eb19..b4d7cf495a59 100644 --- a/sal/rtl/alloc_impl.hxx +++ b/sal/rtl/alloc_impl.hxx @@ -153,7 +153,6 @@ lowbit(sal_Size n) (entry)->m_##name##prev->m_##name##next = (entry); \ } - /** rtl_memory_lock_type * (platform dependent) */ @@ -193,7 +192,6 @@ typedef CRITICAL_SECTION rtl_memory_lock_type; #error Unknown platform #endif /* SAL_UNX | SAL_W32 */ - /** Cache creation flags. * @internal */ diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index e31790d96256..a6f57022e147 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -116,8 +116,6 @@ rtl::OUString recursivelyExpandMacros( } - - struct rtl_bootstrap_NameValue { OUString sName; @@ -156,8 +154,6 @@ namespace { public rtl::Static< NameValueList, rtl_bootstrap_set_list > {}; } - - static bool getFromCommandLineArgs( rtl::OUString const & key, rtl::OUString * value ) { @@ -219,8 +215,6 @@ static bool getFromCommandLineArgs( return found; } - - extern "C" oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( rtl_uString ** ppFileURL) SAL_THROW_EXTERN_C(); @@ -229,8 +223,6 @@ inline void getExecutableFile_Impl (rtl_uString ** ppFileURL) osl_bootstrap_getExecutableFile_Impl (ppFileURL); } - - static void getExecutableDirectory_Impl (rtl_uString ** ppDirURL) { OUString fileName; @@ -242,8 +234,6 @@ static void getExecutableDirectory_Impl (rtl_uString ** ppDirURL) rtl_uString_newFromStr_WithLength(ppDirURL,fileName.getStr(),nDirEnd); } - - static OUString & getIniFileName_Impl() { osl::MutexGuard guard( osl::Mutex::getGlobalMutex() ); @@ -309,7 +299,6 @@ static OUString & getIniFileName_Impl() return *pStaticName; } - // #111772# // ensure the given file url has no final slash @@ -353,8 +342,6 @@ struct Bootstrap_Impl ExpandRequestLink const * requestStack) const; }; - - Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) : _nRefCount( 0 ), _base_ini( 0 ), @@ -420,16 +407,12 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) #endif /* OSL_DEBUG_LEVEL > 1 */ } - - Bootstrap_Impl::~Bootstrap_Impl() { if (_base_ini != 0) rtl_bootstrap_args_close( _base_ini ); } - - namespace { Bootstrap_Impl * get_static_bootstrap_handle() SAL_THROW(()) @@ -653,8 +636,6 @@ bootstrap_map::t * bootstrap_map::m_map = NULL; } - - rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open ( rtl_uString * pIniName ) SAL_THROW_EXTERN_C() @@ -709,8 +690,6 @@ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open ( return static_cast< rtlBootstrapHandle >( that ); } - - void SAL_CALL rtl_bootstrap_args_close ( rtlBootstrapHandle handle ) SAL_THROW_EXTERN_C() @@ -746,8 +725,6 @@ void SAL_CALL rtl_bootstrap_args_close ( } } - - sal_Bool SAL_CALL rtl_bootstrap_get_from_handle( rtlBootstrapHandle handle, rtl_uString * pName, @@ -769,8 +746,6 @@ sal_Bool SAL_CALL rtl_bootstrap_get_from_handle( return found; } - - void SAL_CALL rtl_bootstrap_get_iniName_from_handle ( rtlBootstrapHandle handle, rtl_uString ** ppIniName @@ -791,8 +766,6 @@ void SAL_CALL rtl_bootstrap_get_iniName_from_handle ( } } - - void SAL_CALL rtl_bootstrap_setIniFileName ( rtl_uString * pName ) SAL_THROW_EXTERN_C() @@ -802,8 +775,6 @@ void SAL_CALL rtl_bootstrap_setIniFileName ( file = pName; } - - sal_Bool SAL_CALL rtl_bootstrap_get ( rtl_uString * pName, rtl_uString ** ppValue, @@ -813,8 +784,6 @@ sal_Bool SAL_CALL rtl_bootstrap_get ( return rtl_bootstrap_get_from_handle(0, pName, ppValue, pDefault); } - - void SAL_CALL rtl_bootstrap_set ( rtl_uString * pName, rtl_uString * pValue @@ -848,8 +817,6 @@ void SAL_CALL rtl_bootstrap_set ( r_rtl_bootstrap_set_list.push_back( rtl_bootstrap_NameValue( name, value ) ); } - - void SAL_CALL rtl_bootstrap_expandMacros_from_handle ( rtlBootstrapHandle handle, rtl_uString ** macro @@ -864,8 +831,6 @@ void SAL_CALL rtl_bootstrap_expandMacros_from_handle ( rtl_uString_assign( macro, expanded.pData ); } - - void SAL_CALL rtl_bootstrap_expandMacros( rtl_uString ** macro ) SAL_THROW_EXTERN_C() diff --git a/sal/rtl/byteseq.cxx b/sal/rtl/byteseq.cxx index c593cdc8b04f..fe241797475f 100644 --- a/sal/rtl/byteseq.cxx +++ b/sal/rtl/byteseq.cxx @@ -35,7 +35,6 @@ static sal_Sequence aEmpty_rtl_ByteSeq = { 0 } /* sal_Unicode buffer[1]; */ }; - void SAL_CALL rtl_byte_sequence_reference2One( sal_Sequence ** ppSequence ) SAL_THROW_EXTERN_C() { @@ -73,7 +72,6 @@ void SAL_CALL rtl_byte_sequence_reference2One( } } - void SAL_CALL rtl_byte_sequence_realloc( sal_Sequence ** ppSequence, sal_Int32 nSize ) SAL_THROW_EXTERN_C() { @@ -123,7 +121,6 @@ void SAL_CALL rtl_byte_sequence_realloc( *ppSequence = pSequence; } - void SAL_CALL rtl_byte_sequence_acquire( sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { @@ -131,7 +128,6 @@ void SAL_CALL rtl_byte_sequence_acquire( sal_Sequence *pSequence ) osl_atomic_increment( &(pSequence->nRefCount) ); } - void SAL_CALL rtl_byte_sequence_release( sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { @@ -144,7 +140,6 @@ void SAL_CALL rtl_byte_sequence_release( sal_Sequence *pSequence ) } } - void SAL_CALL rtl_byte_sequence_construct( sal_Sequence **ppSequence , sal_Int32 nLength ) SAL_THROW_EXTERN_C() { @@ -172,7 +167,6 @@ void SAL_CALL rtl_byte_sequence_construct( sal_Sequence **ppSequence , sal_Int32 } } - void SAL_CALL rtl_byte_sequence_constructNoDefault( sal_Sequence **ppSequence , sal_Int32 nLength ) SAL_THROW_EXTERN_C() { @@ -192,7 +186,6 @@ void SAL_CALL rtl_byte_sequence_constructNoDefault( sal_Sequence **ppSequence , } } - void SAL_CALL rtl_byte_sequence_constructFromArray( sal_Sequence **ppSequence, const sal_Int8 *pData , sal_Int32 nLength ) SAL_THROW_EXTERN_C() @@ -202,7 +195,6 @@ void SAL_CALL rtl_byte_sequence_constructFromArray( memcpy( (*ppSequence)->elements, pData, nLength ); } - void SAL_CALL rtl_byte_sequence_assign( sal_Sequence **ppSequence , sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { @@ -220,7 +212,6 @@ void SAL_CALL rtl_byte_sequence_assign( sal_Sequence **ppSequence , sal_Sequence } - sal_Bool SAL_CALL rtl_byte_sequence_equals( sal_Sequence *pSequence1 , sal_Sequence *pSequence2 ) SAL_THROW_EXTERN_C() { @@ -240,15 +231,12 @@ sal_Bool SAL_CALL rtl_byte_sequence_equals( sal_Sequence *pSequence1 , sal_Seque == 0; } - - const sal_Int8 *SAL_CALL rtl_byte_sequence_getConstArray( sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { return ((const sal_Int8*)(pSequence->elements)); } - sal_Int32 SAL_CALL rtl_byte_sequence_getLength( sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { diff --git a/sal/rtl/cmdargs.cxx b/sal/rtl/cmdargs.cxx index 64e9c5d5af38..f2d103fb48a8 100644 --- a/sal/rtl/cmdargs.cxx +++ b/sal/rtl/cmdargs.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/sal/rtl/hash.cxx b/sal/rtl/hash.cxx index 79c4f798d7e8..4de72e3f6ec7 100644 --- a/sal/rtl/hash.cxx +++ b/sal/rtl/hash.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hash.hxx" #include "strimp.hxx" #include @@ -146,7 +145,6 @@ compareEqual (rtl_uString *pStringA, rtl_uString *pStringB) pStringB->buffer, pStringB->length); } - rtl_uString * rtl_str_hash_intern (rtl_uString *pString, int can_return) diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index 111d0da9f688..e030b9ca0c33 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "rtl/math.h" #include "osl/diagnose.h" @@ -37,7 +36,6 @@ #include #include - static int const n10Count = 16; static double const n10s[2][n10Count] = { { 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, @@ -272,7 +270,6 @@ struct UStringTraits } }; - // Solaris C++ 5.2 compiler has problems when "StringT ** pResult" is // "typename T::String ** pResult" instead: template< typename T, typename StringT > @@ -661,7 +658,6 @@ void SAL_CALL rtl_math_doubleToUString(rtl_uString ** pResult, cDecSeparator, pGroups, cGroupSeparator, bEraseTrailingDecZeros); } - namespace { // if nExp * 10 + nAdd would result in overflow @@ -1050,13 +1046,11 @@ double SAL_CALL rtl_math_round(double fValue, int nDecPlaces, return bSign ? -fValue : fValue; } - double SAL_CALL rtl_math_pow10Exp(double fValue, int nExp) SAL_THROW_EXTERN_C() { return fValue * getN10Exp( nExp ); } - double SAL_CALL rtl_math_approxValue( double fValue ) SAL_THROW_EXTERN_C() { if (fValue == 0.0 || fValue == HUGE_VAL || !::rtl::math::isFinite( fValue)) @@ -1088,7 +1082,6 @@ double SAL_CALL rtl_math_approxValue( double fValue ) SAL_THROW_EXTERN_C() return bSign ? -fValue : fValue; } - double SAL_CALL rtl_math_expm1( double fValue ) SAL_THROW_EXTERN_C() { double fe = exp( fValue ); @@ -1099,7 +1092,6 @@ double SAL_CALL rtl_math_expm1( double fValue ) SAL_THROW_EXTERN_C() return (fe-1.0) * fValue / log(fe); } - double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C() { // Use volatile because a compiler may be too smart "optimizing" the @@ -1114,13 +1106,11 @@ double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C() return log(fp) * fValue / (fp-1.0); } - double SAL_CALL rtl_math_atanh( double fValue ) SAL_THROW_EXTERN_C() { return 0.5 * rtl_math_log1p( 2.0 * fValue / (1.0-fValue) ); } - /** Parent error function (erf) that calls different algorithms based on the value of x. It takes care of cases where x is negative as erf is an odd function i.e. erf(-x) = -erf(x). @@ -1160,7 +1150,6 @@ double SAL_CALL rtl_math_erf( double x ) SAL_THROW_EXTERN_C() return fErf; } - /** Parent complementary error function (erfc) that calls different algorithms based on the value of x. It takes care of cases where x is negative as erfc satisfies relationship erfc(-x) = 2 - erfc(x). See the comment for Erf(x) diff --git a/sal/rtl/uuid.cxx b/sal/rtl/uuid.cxx index f7f3c0c08bd3..ea850546f36c 100644 --- a/sal/rtl/uuid.cxx +++ b/sal/rtl/uuid.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -89,7 +88,6 @@ static void write_v3( sal_uInt8 *pUuid ) memcpy( pUuid , &uuid , 16 ); } - extern "C" void SAL_CALL rtl_createUuid( sal_uInt8 *pTargetUUID , SAL_UNUSED_PARAMETER const sal_uInt8 *, SAL_UNUSED_PARAMETER sal_Bool ) @@ -118,7 +116,6 @@ extern "C" void SAL_CALL rtl_createUuid( sal_uInt8 *pTargetUUID , pTargetUUID[8] |= 0x80; } - extern "C" void SAL_CALL rtl_createNamedUuid( sal_uInt8 *pTargetUUID, const sal_uInt8 *pNameSpaceUUID, const rtl_String *pName ) @@ -134,8 +131,6 @@ extern "C" void SAL_CALL rtl_createNamedUuid( sal_uInt8 *pTargetUUID, write_v3(pTargetUUID); } - - extern "C" sal_Int32 SAL_CALL rtl_compareUuid( const sal_uInt8 *pUUID1 , const sal_uInt8 *pUUID2 ) { int i; diff --git a/sal/test/test_salmain.cxx b/sal/test/test_salmain.cxx index 563cc693e054..93984e582c1e 100644 --- a/sal/test/test_salmain.cxx +++ b/sal/test/test_salmain.cxx @@ -21,7 +21,6 @@ #include - SAL_IMPLEMENT_MAIN() { fprintf(stderr, "success!\n"); diff --git a/sal/test/test_salmainwithargs.cxx b/sal/test/test_salmainwithargs.cxx index 842ecbef3b79..405cd91c2496 100644 --- a/sal/test/test_salmainwithargs.cxx +++ b/sal/test/test_salmainwithargs.cxx @@ -21,7 +21,6 @@ #include - SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { fprintf(stderr, "argc: %i argv: %p - success!\n", argc, argv); diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx index a7eee9a9bfc0..a9a445fae92a 100644 --- a/sal/test/testbootstrap.cxx +++ b/sal/test/testbootstrap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -29,7 +28,6 @@ using namespace ::rtl; - int main( int argc, char *argv[] ) { osl_setCommandArgs (argc, argv); @@ -54,7 +52,6 @@ int main( int argc, char *argv[] ) exit( 1 ); } - OUString iniName; Bootstrap::get(OUString("iniName"), iniName, OUString()); @@ -68,7 +65,6 @@ int main( int argc, char *argv[] ) Bootstrap bootstrap(iniName); - OUString name( "MYBOOTSTRAPTESTVALUE" ); OUString myDefault("$Default"); diff --git a/sal/workben/clipboardwben/testcopy/StdAfx.h b/sal/workben/clipboardwben/testcopy/StdAfx.h index 480916b75367..25b59fe0ec1a 100644 --- a/sal/workben/clipboardwben/testcopy/StdAfx.h +++ b/sal/workben/clipboardwben/testcopy/StdAfx.h @@ -3,7 +3,6 @@ // oder projektspezifische Include-Dateien, die häufig benutzt, aber // in unregelmäßigen Abständen geändert werden. - #if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) #define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ @@ -13,7 +12,6 @@ #define WIN32_LEAN_AND_MEAN // Selten benutzte Teile der Windows-Header nicht einbinden - // Windows-Header-Dateien: #include diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx index df80774bcb84..ac7b60e27e3e 100644 --- a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx +++ b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx @@ -24,36 +24,25 @@ #include #include - // namespace directives - - - // OTWrapperDataObject - - // ctor - CXTDataObject::CXTDataObject( LONG nRefCntInitVal ) : m_nRefCnt( nRefCntInitVal ) { } - // dtor - CXTDataObject::~CXTDataObject( ) { } - // IUnknown->QueryInterface - STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject ) { OSL_ASSERT( NULL != ppvObject ); @@ -75,19 +64,15 @@ STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject ) return hr; } - // IUnknown->AddRef - STDMETHODIMP_(ULONG) CXTDataObject::AddRef( ) { return static_cast< ULONG >( InterlockedIncrement( &m_nRefCnt ) ); } - // IUnknown->Release - STDMETHODIMP_(ULONG) CXTDataObject::Release( ) { // we need a helper variable because it's @@ -103,11 +88,9 @@ STDMETHODIMP_(ULONG) CXTDataObject::Release( ) return nRefCnt; } - // IDataObject->GetData // warning: 'goto' ahead (to easy error handling without using exceptions) - STDMETHODIMP CXTDataObject::GetData(LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) { OSL_ASSERT( ( NULL != pFormatetc ) && @@ -178,10 +161,8 @@ STDMETHODIMP CXTDataObject::GetData(LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium return hr; } - // IDataObject->EnumFormatEtc - STDMETHODIMP CXTDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc ) { if ( ( NULL == ppenumFormatetc ) || ( DATADIR_SET == dwDirection ) ) @@ -201,88 +182,66 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** p return hr; } - // IDataObject->QueryGetData - STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc ) { return E_NOTIMPL; } - // IDataObject->GetDataHere - STDMETHODIMP CXTDataObject::GetDataHere( LPFORMATETC, LPSTGMEDIUM ) { return E_NOTIMPL; } - // IDataObject->GetCanonicalFormatEtc - STDMETHODIMP CXTDataObject::GetCanonicalFormatEtc( LPFORMATETC, LPFORMATETC ) { return E_NOTIMPL; } - // IDataObject->SetData - STDMETHODIMP CXTDataObject::SetData( LPFORMATETC, LPSTGMEDIUM, BOOL ) { return E_NOTIMPL; } - // IDataObject->DAdvise - STDMETHODIMP CXTDataObject::DAdvise( LPFORMATETC, DWORD, LPADVISESINK, DWORD * ) { return E_NOTIMPL; } - // IDataObject->DUnadvise - STDMETHODIMP CXTDataObject::DUnadvise( DWORD ) { return E_NOTIMPL; } - // IDataObject->EnumDAdvise - STDMETHODIMP CXTDataObject::EnumDAdvise( LPENUMSTATDATA * ) { return E_NOTIMPL; } - // for our convenience - CXTDataObject::operator IDataObject*( ) { return static_cast< IDataObject* >( this ); } - - // CEnumFormatEtc - - - // ctor - CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN pUnkDataObj ) : m_nRefCnt( 0 ), m_pUnkDataObj( pUnkDataObj ), @@ -292,18 +251,14 @@ CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN pUnkDataObj ) : m_cfFormats[1] = CF_TEXT; } - // dtor - CEnumFormatEtc::~CEnumFormatEtc( ) { } - // IUnknown->QueryInterface - STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject ) { if ( NULL == ppvObject ) @@ -323,10 +278,8 @@ STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject ) return hr; } - // IUnknown->AddRef - STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( ) { // keep the dataobject alive @@ -334,10 +287,8 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( ) return InterlockedIncrement( &m_nRefCnt ); } - // IUnknown->Release - STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( ) { // release the outer dataobject @@ -353,10 +304,8 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( ) return nRefCnt; } - // IEnumFORMATETC->Next - STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFetched ) { OSL_ASSERT( ( ( celt > 0 ) && ( NULL != rgelt ) ) || @@ -397,10 +346,8 @@ STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFe return hr; } - // IEnumFORMATETC->Skip - STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt ) { HRESULT hr = S_FALSE; @@ -414,20 +361,16 @@ STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt ) return hr; } - // IEnumFORMATETC->Reset - STDMETHODIMP CEnumFormatEtc::Reset( ) { m_nCurrentPos = 0; return S_OK; } - // IEnumFORMATETC->Clone - STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum ) { OSL_ASSERT( NULL != ppenum ); diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx index 6595e9a03a62..b899344142f1 100644 --- a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx +++ b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef _XTDATAOBJECT_HXX_ #define _XTDATAOBJECT_HXX_ @@ -39,10 +38,8 @@ public: CXTDataObject( LONG nRefCntInitVal = 0); ~CXTDataObject( ); - // ole interface implementation - //IUnknown STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject); STDMETHODIMP_( ULONG ) AddRef( ); @@ -104,7 +101,6 @@ private: CLIPFORMAT m_cfFormats[2]; }; - typedef CEnumFormatEtc *PCEnumFormatEtc; #endif diff --git a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx index b545d414334d..27f0fe204dd0 100644 --- a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx +++ b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // TestWin32.cpp : Defines the entry point for the application. - #define _WIN32_DCOM #undef _UNICODE @@ -58,7 +56,6 @@ void FlushClipboard( ); void PasteData( HWND hWnd ); void SetLocale(); - LPSTREAM g_pStm = NULL; char* pTextBuff = NULL; DWORD lData = 0; @@ -67,10 +64,8 @@ HWND g_hWnd; HANDLE g_hEvent; BOOL g_bEnd; - // a thread function - unsigned int _stdcall ThreadProc(LPVOID pParam) { while( !g_bEnd ) @@ -82,10 +77,8 @@ unsigned int _stdcall ThreadProc(LPVOID pParam) return 0; } - // WinMain - int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, @@ -104,7 +97,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, hr = OleInitialize( NULL ); #endif - // Initialize global strings LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); LoadString(hInstance, IDC_TESTWIN32, szWindowClass, MAX_LOADSTRING); @@ -140,9 +132,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, return msg.wParam; } - - - // FUNCTION: MyRegisterClass() // // PURPOSE: Registers the window class. @@ -153,7 +142,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, // function, which was added to Windows 95. If it important to call // this function to allow the use of small icons in the correct proportions. - ATOM MyRegisterClass( HINSTANCE hInstance ) { WNDCLASSEX wcex; @@ -175,7 +163,6 @@ ATOM MyRegisterClass( HINSTANCE hInstance ) return RegisterClassEx(&wcex); } - // FUNCTION: InitInstance(HANDLE, int) // // PURPOSE: Saves instance access number and creates main window @@ -184,7 +171,6 @@ ATOM MyRegisterClass( HINSTANCE hInstance ) // In this function, the instance access number is stored in a global variable // and the main program window is displayed. - BOOL InitInstance( HINSTANCE hInstance, int nCmdShow ) { hInst = hInstance; // Store instance access number in our global variable. @@ -203,7 +189,6 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow ) return TRUE; } - // FUNCTION: WndProc(HWND, unsigned, WORD, LONG) // // PURPOSE: Processes messages for the main window. @@ -212,7 +197,6 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow ) // WM_PAINT - Display main windows // WM_DESTROY - Output completion message and return - LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { int wmId; @@ -220,7 +204,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) HDC hdc; TCHAR szHello[MAX_LOADSTRING]; - LoadString(hInst, IDS_HELLO, szHello, MAX_LOADSTRING); switch( message ) @@ -279,10 +262,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) return 0; } - // copy data into the clipboard - void CopyClipboardData( HWND hWnd ) { g_xtDo = new CXTDataObject( 1 ); @@ -293,10 +274,8 @@ void CopyClipboardData( HWND hWnd ) #endif } - // flush the content into the clipboard - void FlushClipboard( ) { if ( NULL != g_xtDo ) @@ -315,7 +294,6 @@ void FlushClipboard( ) } } - void PasteData(HWND hWnd) { IDataObject* pDataObj; @@ -362,7 +340,6 @@ void PasteData(HWND hWnd) } } - void SetLocale() { LCID threadLcid = GetThreadLocale(); diff --git a/sal/workben/clipboardwben/testpaste/StdAfx.h b/sal/workben/clipboardwben/testpaste/StdAfx.h index 480916b75367..25b59fe0ec1a 100644 --- a/sal/workben/clipboardwben/testpaste/StdAfx.h +++ b/sal/workben/clipboardwben/testpaste/StdAfx.h @@ -3,7 +3,6 @@ // oder projektspezifische Include-Dateien, die häufig benutzt, aber // in unregelmäßigen Abständen geändert werden. - #if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) #define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ @@ -13,7 +12,6 @@ #define WIN32_LEAN_AND_MEAN // Selten benutzte Teile der Windows-Header nicht einbinden - // Windows-Header-Dateien: #include diff --git a/sal/workben/clipboardwben/testpaste/cbptest.cxx b/sal/workben/clipboardwben/testpaste/cbptest.cxx index f41698743447..5a5faeafa88e 100644 --- a/sal/workben/clipboardwben/testpaste/cbptest.cxx +++ b/sal/workben/clipboardwben/testpaste/cbptest.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // TestWin32.cpp : Defines the entry point for the application - #define _WIN32_DCOM #include "stdafx.h" @@ -55,10 +53,8 @@ LPSTREAM g_pStm = NULL; char* pTextBuff = NULL; DWORD lData = 0; - // a thread function - unsigned int _stdcall ThreadProc(LPVOID pParam) { IDataObject* pIDataObj = NULL; @@ -119,10 +115,8 @@ unsigned int _stdcall ThreadProc(LPVOID pParam) return 0; } - // WinMain - int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, @@ -169,8 +163,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, return msg.wParam; } - - // // FUNCTION: MyRegisterClass() // @@ -249,7 +241,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) HDC hdc; TCHAR szHello[MAX_LOADSTRING]; - LoadString(hInst, IDS_HELLO, szHello, MAX_LOADSTRING); switch( message ) @@ -348,10 +339,8 @@ void PasteClipboardData2(HWND hwndParent) } } - // clipboard handling - /* void PasteClipboardData(HWND hwndParent) { diff --git a/sal/workben/clipboardwben/testviewer/StdAfx.h b/sal/workben/clipboardwben/testviewer/StdAfx.h index 480916b75367..25b59fe0ec1a 100644 --- a/sal/workben/clipboardwben/testviewer/StdAfx.h +++ b/sal/workben/clipboardwben/testviewer/StdAfx.h @@ -3,7 +3,6 @@ // oder projektspezifische Include-Dateien, die häufig benutzt, aber // in unregelmäßigen Abständen geändert werden. - #if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) #define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ @@ -13,7 +12,6 @@ #define WIN32_LEAN_AND_MEAN // Selten benutzte Teile der Windows-Header nicht einbinden - // Windows-Header-Dateien: #include diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx b/sal/workben/clipboardwben/testviewer/cbvtest.cxx index 9eda0fbd94e7..f6057c86909a 100644 --- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx +++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // TestWin32.cpp : Defines the entry point for the application. - #define _WIN32_DCOM #include "stdafx.h" @@ -65,10 +63,8 @@ void CALLBACK OnClipboardContentChange( void ); LRESULT CALLBACK WndProc( HWND, UINT, WPARAM, LPARAM ); LRESULT CALLBACK About( HWND, UINT, WPARAM, LPARAM ); - // WinMain - int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, @@ -116,8 +112,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, return msg.wParam; } - - // // FUNCTION: MyRegisterClass() // @@ -194,7 +188,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) HDC hdc; WCHAR szHello[MAX_LOADSTRING]; - LoadStringW(g_hInst, IDS_HELLO, szHello, MAX_LOADSTRING); switch( message ) diff --git a/sal/workben/getlocaleinfotest.cxx b/sal/workben/getlocaleinfotest.cxx index 388fa24cc035..d1f3db5328f7 100644 --- a/sal/workben/getlocaleinfotest.cxx +++ b/sal/workben/getlocaleinfotest.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -37,5 +36,4 @@ int _cdecl main( int argc, char * argv[] ) return(0); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/workben/t_cipher.c b/sal/workben/t_cipher.c index 335d48583cd4..dd802e08c441 100644 --- a/sal/workben/t_cipher.c +++ b/sal/workben/t_cipher.c @@ -130,7 +130,6 @@ unsigned long ciphertext_r[NUM_VARIABLE_KEY_TESTS + NUM_SET_KEY_TESTS] = { 0x8CE2D14Bl, 0x469FF67Bl, 0xC1BC96A8l, 0x3858DA9Fl, 0x9B9DB21Fl, 0xFD36B46Fl, 0x5A5479ADl, 0xFA52D080l }; - static sal_uInt8 cbc_key[16] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, diff --git a/sal/workben/t_digest.c b/sal/workben/t_digest.c index f2bbf62fe6a2..499c7e927539 100644 --- a/sal/workben/t_digest.c +++ b/sal/workben/t_digest.c @@ -82,7 +82,6 @@ static const char *digest_bigout_SHA_0= static const char *digest_bigout_SHA_1= "34aa973cd4c4daa4f61eeb2bdbad27316534016f"; - static const char digest_key_HMAC_MD5_1[] = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, @@ -144,7 +143,6 @@ static const char *digest_out_HMAC_SHA1[] = NULL }; - static char *pt (unsigned char *md, int length) { int i; @@ -291,7 +289,6 @@ int SAL_CALL main (void) else printf("test (SHA-1) n ok\n"); - P=digest_in_HMAC_MD5; Q=digest_key_HMAC_MD5; R=digest_out_HMAC_MD5; @@ -319,7 +316,6 @@ int SAL_CALL main (void) } rtl_digest_destroyHMAC_MD5 (Digest); - P=digest_in_HMAC_MD5; Q=digest_key_HMAC_MD5; R=digest_out_HMAC_SHA1; @@ -347,7 +343,6 @@ int SAL_CALL main (void) } rtl_digest_destroyHMAC_SHA1 (Digest); - P=digest_in_HMAC_MD5; Q=digest_key_HMAC_MD5; rtl_digest_PBKDF2 ( diff --git a/sal/workben/t_ojp_exe.cxx b/sal/workben/t_ojp_exe.cxx index a3066c554bcc..a0ea3ab67231 100644 --- a/sal/workben/t_ojp_exe.cxx +++ b/sal/workben/t_ojp_exe.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifdef WNT # define WIN32_LEAN_AND_MEAN # include diff --git a/sal/workben/test.cxx b/sal/workben/test.cxx index a21759e97e76..de7fc035358e 100644 --- a/sal/workben/test.cxx +++ b/sal/workben/test.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #if (defined UNX) @@ -53,5 +52,4 @@ int _cdecl main( int argc, char * argv[] ) return(0); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx index b4392a4136b1..0148a22f5b8a 100644 --- a/sal/workben/testfile.cxx +++ b/sal/workben/testfile.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define UNICODE - #include #include #include @@ -30,7 +28,6 @@ #include #include - #ifdef UNX #include #endif @@ -57,8 +54,6 @@ rtl::OUString file3; rtl::OUString file_on_server; rtl::OUString file_not_exist; - - void print_error(const ::rtl::OString& str, FileBase::RC rc); void PressKey() @@ -78,10 +73,8 @@ void printFileName(const ::rtl::OUString& str) return; } - // Initialization - sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBreak ) { sal_Bool fSuccess=sal_False; @@ -188,7 +181,6 @@ sal_Bool Initialize( void ) if ( rc!=FileBase::E_None ) return sal_False; - pBegin=pBuffer; pCount=pBegin; @@ -229,7 +221,6 @@ sal_Bool Initialize( void ) rtl_freeMemory( pBuffer ); - // Create directories rc=Directory::create( dir1 ); if ( rc!=FileBase::E_None ) @@ -267,10 +258,8 @@ sal_Bool Initialize( void ) return sal_True; } - // Shutdown - sal_Bool Shutdown( void ) { sal_Bool fSuccess=sal_True; @@ -318,10 +307,8 @@ sal_Bool Shutdown( void ) return fSuccess; } - // helper functions - // Show FileType void showFileType( FileStatus::Type aType ) { @@ -408,7 +395,6 @@ void showTime( TimeValue aTime ) else printf ("Verify : TimeValue : Error! \n"); - if ( osl_getSystemTimeFromLocalTime( &aLocalTimeVal , &aSysTimeVal ) ) { if ( ( aSysTimeVal.Seconds == aTime.Seconds ) && ( aSysTimeVal.Nanosec == aTime.Nanosec )) @@ -439,11 +425,8 @@ TimeValue getSystemTime() return aTime; } - - // DirectoryOpenAndCloseTest - void DirectoryOpenAndCloseTest( void ) { FileBase::RC rc; @@ -453,10 +436,8 @@ void DirectoryOpenAndCloseTest( void ) printf( "Directory-Open-And-Close-Test\n"); printf( "--------------------------------------------\n\n"); - // open an existing directory - pDir=new Directory( dir1 ); printf( "Open an existing directory: "); printFileName( dir1 ); @@ -477,10 +458,8 @@ void DirectoryOpenAndCloseTest( void ) delete pDir; printf( "\n" ); - // open a not existing directory - pDir=new Directory( dir_not_exist ); printf( "Open a not existing directory: "); @@ -495,7 +474,6 @@ void DirectoryOpenAndCloseTest( void ) printf( "\n" ); - // open a directory with a wrong semantic pDir=new Directory( dir_wrong_semantic ); @@ -511,10 +489,8 @@ void DirectoryOpenAndCloseTest( void ) printf( "\n" ); - // open an existing directory on a server - pDir=new Directory( dir_on_server ); printf( "Open an existing directory on a server: "); @@ -531,10 +507,8 @@ void DirectoryOpenAndCloseTest( void ) delete pDir; printf( "\n" ); - // open a not existing directory on a server - pDir=new Directory( dir_not_exist_on_server ); printf( "Open a not existing directory on a server: "); @@ -547,10 +521,8 @@ void DirectoryOpenAndCloseTest( void ) delete pDir; printf( "\n" ); - // Close a not existing directory - pDir=new Directory( dir_not_exist ); printf( "Close a not existing directory: "); printFileName( dir_not_exist ); @@ -564,10 +536,8 @@ void DirectoryOpenAndCloseTest( void ) } - // DirectoryCreateAndRemoveTest - void DirectoryCreateAndRemoveTest( void ) { FileBase::RC rc,rc1; @@ -577,7 +547,6 @@ void DirectoryCreateAndRemoveTest( void ) printf( "Directory-Create-And-Remove-Test\n" ); printf( "--------------------------------------------\n\n" ); - // Create directory printf( "Create a not existing directory: "); @@ -597,10 +566,8 @@ void DirectoryCreateAndRemoveTest( void ) printf( "\n" ); - // Create a directory on a server - printf( "Create a not existing directory on a server: "); printFileName( dir_not_exist_on_server ); printf( "\n" ); @@ -617,10 +584,8 @@ void DirectoryCreateAndRemoveTest( void ) printf( "\n" ); - // Remove Directories - printf( "Remove the created directories: \n" ); rc=Directory::remove( dir_not_exist ); @@ -636,10 +601,8 @@ void DirectoryCreateAndRemoveTest( void ) printf( "\n" ); - // Remove a not existing directory - printf( "Remove a not existing directory: "); printFileName( dir_not_exist ); printf( "\n" ); @@ -651,10 +614,8 @@ void DirectoryCreateAndRemoveTest( void ) return; } - // FileOpenAndCloseTest - static void FileOpenAndCloseTest( void ) { FileBase::RC rc; @@ -671,42 +632,32 @@ static void FileOpenAndCloseTest( void ) printFileName( file1 ); printf( "\n" ); - // open an existing file (Read) - rc=pFile->open( osl_File_OpenFlag_Read ); print_error( rtl::OString( "Open File (Read)" ), rc ); - // close the file - rc=pFile->close(); print_error( rtl::OString( "Close File" ), rc ); printf( "\n" ); - // open an existing file (Write) - rc=pFile->open( osl_File_OpenFlag_Write ); print_error( rtl::OString( "Open File (Write)" ), rc ); - // close the file - rc=pFile->close(); print_error( rtl::OString( "Close File" ), rc ); printf( "\n" ); - // close the file a second time - rc=pFile->close(); print_error( rtl::OString( "Close the file a second time" ), rc ); @@ -714,10 +665,8 @@ static void FileOpenAndCloseTest( void ) PressKey(); } - // FileCreateAndRemoveTest - void FileCreateAndRemoveTest() { FileBase::RC rc; @@ -733,40 +682,31 @@ void FileCreateAndRemoveTest() printFileName( file_not_exist ); printf( "\n" ); - // open (create) a not existing file (Read and write) - rc = pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc ); - // close the file - rc=pFile->close(); print_error( rtl::OString( "Close File" ), rc ); - // remove the file - rc=pFile->remove( file_not_exist ); print_error( rtl::OString(" Remove File" ), rc ); printf( "\n" ); - // remove the same file a second time rc=pFile->remove( file_not_exist ); print_error( rtl::OString( "Remove a not existing File" ), rc ); - // remove an open file - pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); rc=pFile->remove( file_not_exist ); @@ -780,10 +720,8 @@ void FileCreateAndRemoveTest() return; } - // FileWriteAndReadTest - void FileWriteAndReadTest( void ) { FileBase::RC rc; @@ -806,17 +744,14 @@ void FileWriteAndReadTest( void ) printFileName( file_not_exist ); printf("\n"); - // open (create) a not existing file (Read and write) - rc = pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc ); printf( "\n" ); - // write a string to the file rc=pFile->write( pWriteBuffer , nLen , uWritten ); @@ -829,19 +764,15 @@ void FileWriteAndReadTest( void ) printf( "\n" ); - // move the filepointer to the beginning - rc=pFile->setPos( osl_Pos_Absolut , 0 ); print_error( rtl::OString( "Set FilePointer to the beginning of the file" ), rc ); printf( "\n" ); - // read the string - pReadBuffer=(sal_Char*) rtl_allocateMemory( (sal_uInt32)(nLen+1)*sizeof(sal_Char) ); memset( pReadBuffer, 0, (sal_uInt32)(nLen+1)*sizeof(sal_Char) ); rc=pFile->read( pReadBuffer , nLen,uRead ); @@ -873,10 +804,8 @@ void FileWriteAndReadTest( void ) } - // FileCopyMoveTest - void FileCopyAndMoveTest( void ) { FileBase::RC rc; @@ -885,14 +814,11 @@ void FileCopyAndMoveTest( void ) printf( "File-Copy-Move-Test\n" ); printf( "--------------------------------------------\n\n" ); - File *pFile; rtl::OUString destPath(dir2); - // FileCopyTest - destPath+=rtl::OUString("/"); destPath+=file3; @@ -902,7 +828,6 @@ void FileCopyAndMoveTest( void ) printFileName( destPath ); printf( "\n" ); - rc=File::copy( file1 , destPath ); print_error( rtl::OString( "FileCopy" ), rc ); @@ -922,10 +847,8 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - // Copy a file to a not existing directory - destPath=rtl::OUString( dir_not_exist ); destPath+=rtl::OUString("/"); destPath+=file3; @@ -940,10 +863,8 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - // Copy a directory - printf( "Copy the directory: "); printFileName( dir1 ); printf( " to "); @@ -955,10 +876,8 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - // FileMoveTest - destPath=rtl::OUString( dir2 ); destPath+=rtl::OUString("/"); destPath+=file3; @@ -1003,11 +922,8 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - - // Move a file to a not existing directory - destPath=rtl::OUString( dir_not_exist ); destPath+=rtl::OUString("/"); destPath+=file3; @@ -1024,10 +940,8 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - // Move a directory - printf( "Move a directory: \n"); printf( "Move the directory "); @@ -1036,7 +950,6 @@ void FileCopyAndMoveTest( void ) printFileName( dir_not_exist ); printf( "\n" ); - rc=File::move( dir1 , dir_not_exist); print_error( rtl::OString( "FileMove" ), rc ); @@ -1045,15 +958,12 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - PressKey(); return; } - // FileSizeTest - void FileSizeTest( void ) { FileBase::RC rc; @@ -1064,7 +974,6 @@ void FileSizeTest( void ) printf( "File-Size-Test\n" ); printf( "--------------------------------------------\n\n" ); - File aFile( file_not_exist ); printf( "Create File: "); @@ -1080,7 +989,6 @@ void FileSizeTest( void ) // Set Filesize to 5000 - printf( "Set FileSize to 5000\n" ); rc=aFile.setSize( 5000 ); print_error( rtl::OString( "Set FileSize" ), rc ); @@ -1088,10 +996,8 @@ void FileSizeTest( void ) printf( "\n" ); printf( "Verify:\n" ); - // Check whether Filesize is set to 5000 - rc=DirectoryItem::get( file_not_exist, aItem ); print_error( rtl::OString( "Get DirectoryItem" ), rc ); @@ -1114,10 +1020,8 @@ void FileSizeTest( void ) printf( "\n" ); - // Set Filesize to -1 - printf( "Set FileSize to -1\n" ); rc=aFile.setSize( -1 ); print_error( rtl::OString( "Set FileSize" ), rc ); @@ -1138,11 +1042,8 @@ void FileSizeTest( void ) return; } - - // FilePointerTest - void FilePointerTest( void ) { FileBase::RC rc; @@ -1152,7 +1053,6 @@ void FilePointerTest( void ) printf( "File-Pointer-Test\n" ); printf( "--------------------------------------------\n\n" ); - File rFile( file_not_exist ); printf( "Create File: "); @@ -1166,20 +1066,16 @@ void FilePointerTest( void ) if ( rc==FileBase::E_None ) { - // get the position of the filepointer - rc =rFile.getPos( filepointer ); print_error( rtl::OString( "GetPos" ), rc ); printf( "Position of the FilePointer: %" SAL_PRIuUINT64 "\n", filepointer ); printf( "\n" ); - // set the filepointer at the end of a file - printf( "Set FileSize to 5000\n" ); rFile.setSize( 5000 ); @@ -1218,10 +1114,8 @@ void FilePointerTest( void ) return; } - // FileAttributesTest - void verifyFileAttributes( void ) { FileBase::RC rc; @@ -1264,7 +1158,6 @@ void FileAttributesTest( void ) printFileName( file1 ); printf( "\n\n" ); - rc=File::setAttributes( file1, osl_File_Attribute_GrpWrite ); print_error( rtl::OString( "Set Attribute: GrpWrite" ), rc ); @@ -1346,7 +1239,6 @@ void FileAttributesTest( void ) if ( rc!=FileBase::E_None ) print_error( rtl::OString( "Reset Attributes" ), rc ); - rc=File::setAttributes( file1, osl_File_Attribute_GrpWrite | osl_File_Attribute_GrpRead | osl_File_Attribute_GrpExe | osl_File_Attribute_OwnWrite | osl_File_Attribute_OwnRead | osl_File_Attribute_OwnExe | osl_File_Attribute_OthWrite | osl_File_Attribute_OthRead | osl_File_Attribute_OthExe ); print_error( rtl::OString( "Set all Attributes" ), rc ); @@ -1371,7 +1263,6 @@ void FileAttributesTest( void ) printFileName( file1 ); printf( "\n\n" ); - rc=File::setAttributes( file1, osl_File_Attribute_ReadOnly ); print_error( rtl::OString( "Set Attribute: ReadOnly" ), rc ); @@ -1408,10 +1299,8 @@ void FileAttributesTest( void ) } #endif - // FileTimeTest - void FileTimeTest( void ) { FileBase::RC rc; @@ -1454,7 +1343,6 @@ void FileTimeTest( void ) TimeValue aAccessTimeRead; TimeValue aModifyTimeRead; - printf( "--------------------------------------------\n" ); printf( "File-Time-Test\n" ); printf( "--------------------------------------------\n\n" ); @@ -1472,18 +1360,14 @@ void FileTimeTest( void ) printf( "\nModifyTime \t : "); showTime( aModifyTime ); - // setTime - printf( "\n" ); rc=File::setTime( file1 , aCreationTime , aAccessTime , aModifyTime ); print_error( rtl::OString( "SetTime" ), rc ); - // Verify - FileStatus rStatus( osl_FileStatus_Mask_CreationTime | osl_FileStatus_Mask_AccessTime | osl_FileStatus_Mask_ModifyTime); printf( "\nVerify:\n" ); @@ -1502,7 +1386,6 @@ void FileTimeTest( void ) // GetCreationTime - aCreationTimeRead=rStatus.getCreationTime(); #ifdef WNT if ( aCreationTime.Seconds == aCreationTimeRead.Seconds && aCreationTime.Nanosec == aCreationTimeRead.Nanosec ) @@ -1516,7 +1399,6 @@ void FileTimeTest( void ) // GetAccessTime - aAccessTimeRead=rStatus.getAccessTime(); if ( aAccessTime.Seconds == aAccessTimeRead.Seconds && aAccessTime.Nanosec == aAccessTimeRead.Nanosec ) @@ -1527,10 +1409,8 @@ void FileTimeTest( void ) showTime( aAccessTimeRead ); printf( "\n" ); - // GetModifyTime - aModifyTimeRead=rStatus.getModifyTime(); if ( aModifyTime.Seconds == aModifyTimeRead.Seconds && aModifyTime.Nanosec == aModifyTimeRead.Nanosec ) @@ -1547,11 +1427,8 @@ void FileTimeTest( void ) return; } - - // DirectoryItemTest - void DirectoryItemTest( void ) { FileBase::RC rc; @@ -1564,10 +1441,8 @@ void DirectoryItemTest( void ) printf( "Directory-Item-Test\n" ); printf( "--------------------------------------------\n\n" ); - // get DirectoryItem from an existing directory - printf( "Get DirectoryItem from an existing Directory: "); printFileName( dir1 ); printf( "\n"); @@ -1589,10 +1464,8 @@ void DirectoryItemTest( void ) printf( "\n" ); - // get DirectoryItem from a not existing directory - printf( "Get DirectoryItem from a not existing Directory: "); printFileName( dir_not_exist ); printf( "\n" ); @@ -1602,10 +1475,8 @@ void DirectoryItemTest( void ) printf( "\n" ); - // get DirectoryItem from an existing file - printf( "Get DirectoryItem from an existing File: "); printFileName( file1 ); printf( "\n" ); @@ -1627,10 +1498,8 @@ void DirectoryItemTest( void ) printf( "\n" ); - // get DirectoryItem from a not existing file - printf( "Get DirectoryItem from a not existing File: "); printFileName( file_not_exist ); printf( "\n" ); @@ -1640,10 +1509,8 @@ void DirectoryItemTest( void ) printf( "\n" ); - // get DirectoryItem from a directory with a wrong semantic - printf( "Get DirectoryItem from a Directory with a wrong semantic: "); printFileName( dir_not_exist ); printf( "\n" ); @@ -1653,10 +1520,8 @@ void DirectoryItemTest( void ) printf( "\n" ); - // get DirectoryItem from a file-handle - pFile=new File( file1 ); rc=pFile->open( osl_File_OpenFlag_Read ); @@ -1688,20 +1553,16 @@ void DirectoryItemTest( void ) printf( "\n" ); - // get DirectoryItem - printf( "Get DirectoryItem from an empty File-Handle\n" ); rc=DirectoryItem::get( file1 , aItem ); print_error( rtl::OString( "GetDirectoryItem" ), rc ); printf( "\n" ); - // GetNextItem from a directory - pDir=new Directory( dir1 ); printf( "Get next DirectoryItem from a directory: "); printFileName( dir1); @@ -1717,7 +1578,6 @@ void DirectoryItemTest( void ) // get all files from the directory - rtl::OUString str; rtl::OUString str1[2]; @@ -1743,10 +1603,8 @@ void DirectoryItemTest( void ) printf( "\n" ); - // Reset-Test - for (int i=0; i<2; i++) { aItem=DirectoryItem(); @@ -1759,7 +1617,6 @@ void DirectoryItemTest( void ) str1[i]=rStatus.getFileName(); } - if ( str1[0] == str1[1] ) print_error( rtl::OString( "Reset" ),FileBase::E_None ); else @@ -1774,10 +1631,8 @@ void DirectoryItemTest( void ) printf( "\n"); - // GetNextItem from a closed directory - printf( "Get next DirectoryItem from a closed directory: "); printFileName( dir1 ); printf( "\n" ); @@ -1792,36 +1647,29 @@ void DirectoryItemTest( void ) return; } - // FileStatusTest (for different types) - void FileStatusTest( FileStatus *pStatus ) { // GetFileType of the directory - FileStatus::Type aType; printf( "\ngetFileType:\n" ); aType=pStatus->getFileType(); showFileType( aType ); - // GetAttributes - sal_uInt64 uAttributes; printf( "\ngetAttributes:\n" ); uAttributes=pStatus->getAttributes(); showAttributes( uAttributes ); - // GetCreationTime - TimeValue aCreationTime; printf( "\ngetCreationTime:\n" ); @@ -1830,10 +1678,8 @@ void FileStatusTest( FileStatus *pStatus ) printf( "CreationTime: " ); showTime( aCreationTime ); - // GetAccessTime - TimeValue aAccessTime; printf( "\ngetAccessTime:\n" ); @@ -1842,10 +1688,8 @@ void FileStatusTest( FileStatus *pStatus ) printf( "AccessTime: " ); showTime( aAccessTime ); - // GetModifyTime - TimeValue aModifyTime; printf( "\ngetModifyTime:\n" ); @@ -1854,10 +1698,8 @@ void FileStatusTest( FileStatus *pStatus ) printf( "ModifyTime: " ); showTime( aModifyTime ); - // GetFileSize - sal_uInt64 FileSize; printf( "\ngetFileSize:\n" ); @@ -1865,10 +1707,8 @@ void FileStatusTest( FileStatus *pStatus ) FileSize=pStatus->getFileSize(); printf( "FileSize: %" SAL_PRIuUINT64 "\n", FileSize); - // GetFileName - rtl::OUString FileName; printf( "\ngetFileName:\n" ); @@ -1878,10 +1718,8 @@ void FileStatusTest( FileStatus *pStatus ) printFileName( FileName ); printf( "\n" ); - // GetFileURL - rtl::OUString FileURL; printf( "\ngetFileURL:\n" ); @@ -1891,10 +1729,8 @@ void FileStatusTest( FileStatus *pStatus ) printFileName( FileURL ); printf( "\n" ); - // GetLinkTargetURL - rtl::OUString LinkTargetURL; printf( "\ngetLinkTargetURL:\n"); @@ -1907,10 +1743,8 @@ void FileStatusTest( FileStatus *pStatus ) return; } - // DirectoryFileStatusTest - void DirectoryFileStatusTest( void ) { FileBase::RC rc; @@ -1946,10 +1780,8 @@ void DirectoryFileStatusTest( void ) return; } - // FileFileStatusTest - void FileFileStatusTest( void ) { FileBase::RC rc; @@ -1985,10 +1817,8 @@ void FileFileStatusTest( void ) return; } - // VolumeFileStatusTest - void VolumeFileStatusTest( void ) { FileBase::RC rc; @@ -2024,11 +1854,8 @@ void VolumeFileStatusTest( void ) return; } - - // VolumeInfoTest - void VolumeInfoTest( void ) { FileBase::RC rc; @@ -2048,68 +1875,52 @@ void VolumeInfoTest( void ) printf( "\n" ); - // getRemoteFlag - if ( rInfo.getRemoteFlag() ) printf( "RemoteFlag: Yes\n" ); else printf( "RemoteFlag: No\n" ); - // getRemoveableFlag - if ( rInfo.getRemoveableFlag() ) printf( "RemoveableFlag: Yes\n" ); else printf( "RemoveableFlag: No\n" ); - // getTotalSpace - sal_uInt64 TotalSpace; TotalSpace=rInfo.getTotalSpace(); printf( "Total Space: %" SAL_PRIuUINT64 "\n",TotalSpace ); - // getFreeSpace - sal_uInt64 FreeSpace; FreeSpace=rInfo.getFreeSpace(); printf( "Free Space: %" SAL_PRIuUINT64 "\n",FreeSpace ); - // getUsedSpace - sal_uInt64 UsedSpace; UsedSpace=rInfo.getUsedSpace(); printf( "Used Space: %" SAL_PRIuUINT64 "\n",UsedSpace ); - // getMaxNameLength - sal_uInt32 MaxNameLength; MaxNameLength=rInfo.getMaxNameLength(); printf( "MaxNameLength: %" SAL_PRIuUINT32 "\n",MaxNameLength ); - // getMaxPathLength - sal_uInt32 MaxPathLength; MaxPathLength=rInfo.getMaxPathLength(); printf( "MaxPathLength: %" SAL_PRIuUINT32 "\n",MaxPathLength ); - // getFileSystemName - rtl::OUString FileSystemName; FileSystemName=rInfo.getFileSystemName(); printf( "File-System-Name: "); @@ -2120,10 +1931,8 @@ void VolumeInfoTest( void ) return; } - // FileBaseTest - void ConvertPathTest(rtl::OUString& strPath) { FileBase::RC rc; @@ -2133,10 +1942,8 @@ void ConvertPathTest(rtl::OUString& strPath) rtl::OUString strNormPathFromFileURL; rtl::OUString strSystemPath; - // normalizePath - rc=FileBase::getFileURLFromSystemPath( strPath, strNormPath ); if ( rc == FileBase::E_None ) @@ -2148,10 +1955,8 @@ void ConvertPathTest(rtl::OUString& strPath) else printf( "normalizePath: Error \n" ); - // getFileURLFromSystemPath - if ( !strNormPath.isEmpty() ) { rc=FileBase::getFileURLFromSystemPath( strNormPath, strFileURL ); @@ -2168,10 +1973,8 @@ void ConvertPathTest(rtl::OUString& strPath) else printf( "getFileURLFromSystemPath: not tested \n" ); - // getNormalizedPathFromFileURL - if ( !strFileURL.isEmpty() ) { rc=FileBase::getSystemPathFromFileURL( strFileURL, strNormPathFromFileURL ); @@ -2188,11 +1991,8 @@ void ConvertPathTest(rtl::OUString& strPath) else printf( "getNormalizedPathFromFileURL: not tested \n" ); - - // getSystemPathFromFileURL - if ( !strNormPath.isEmpty() ) { rc=FileBase::getSystemPathFromFileURL( strNormPath, strSystemPath ); @@ -2209,10 +2009,8 @@ void ConvertPathTest(rtl::OUString& strPath) else printf( "getSystemPathFromFileURL: not tested \n" ); - // Verify - if ( strNormPathFromFileURL == strNormPath ) printf( "\nVerify: OK ! ( Normalized-Path == Normalized-Path-From-File-URL )\n" ); else @@ -2227,20 +2025,16 @@ void FileBaseTest() printf( "FileBase-Test\n" ); printf( "--------------------------------------------\n\n" ); - // ConvertPath-Test (Local File) - printf( "- Local File: "); printFileName( file1 ); printf( "\n\n" ); ConvertPathTest(file1); - // ConvertPath-Test (File on a server) - printf( "\n- File on server: "); printFileName( file_on_server ); printf( "\n\n" ); @@ -2251,8 +2045,6 @@ void FileBaseTest() return; } - - // AbsolutePathTest void DoAbsolutePathTest(rtl::OUString strDirBase, rtl::OUString strRelative) @@ -2303,11 +2095,8 @@ void AbsolutePathTest(void) return; } - - // searchPathTest - void SearchPathTest(void) { FileBase::RC rc; @@ -2321,16 +2110,13 @@ void SearchPathTest(void) printf( "SearchPath-Test\n" ); printf( "--------------------------------------------\n\n" ); - rc=FileBase::getFileURLFromSystemPath( strNormPath, strFileURL ); print_error( rtl::OString( "getFileURLFromSystemPath" ), rc ); rc=FileBase::getSystemPathFromFileURL( strNormPath, strSystemPath ); print_error( rtl::OString( "getSystemPathFromFileURL" ), rc ); - // searchFileURL (with a normalized path) - if ( !strNormPath.isEmpty() ) { printf( "\nSearch-Normalized-Path (with a normalized path) : "); @@ -2351,10 +2137,8 @@ void SearchPathTest(void) else printf( "searchFileURL (with a normalized path): not tested\n" ); - // searchFileURL (with a File-URL) - if ( !strFileURL.isEmpty() ) { printf( "\nSearch-Normalized-Path (with a FileURL) : "); @@ -2375,10 +2159,8 @@ void SearchPathTest(void) else printf( "searchFileURL (with a FileURL path): not tested\n" ); - // searchFileURL (with a systempath) - if ( !strSystemPath.isEmpty() ) { printf( "\nSearch-Normalized-Path (with a SystemPath) : "); @@ -2399,10 +2181,8 @@ void SearchPathTest(void) else printf( "searchFileURL (with a systempath): not tested\n" ); - // searchFileURL (File and no searchpath) - printf( "\nsearchFileURL: File (no searchpath) : "); printFileName( file3 ); printf( "\n" ); @@ -2418,10 +2198,8 @@ void SearchPathTest(void) else printf( "searchFileURL: File not found: OK ! \n" ); - // searchFileURL (File and Path) - printf( "\nsearchFileURL: File : "); printFileName( file3 ); printf( "\tSearchPath "); @@ -2439,10 +2217,8 @@ void SearchPathTest(void) else printf( "searchFileURL: File not found: Error\n" ); - // searchFileURL (File and searchpath with two entries) - rtl::OUString strSearchPath( dir_not_exist ); strSearchPath+=rtl::OUString(";"); strSearchPath+=dir_on_server; @@ -2464,10 +2240,8 @@ void SearchPathTest(void) else printf( "searchFileURL: File not found: Error\n" ); - // searchFileURL (File and searchpath (with a wrong semantic)) - strSearchPath=rtl::OUString( dir_wrong_semantic ); printf( "\nsearchFileURL: File : "); @@ -2486,10 +2260,8 @@ void SearchPathTest(void) return; } - // CanonicalNameTest - void getCanonicalNameTest(rtl::OUString strPath) { FileBase::RC rc; @@ -2531,10 +2303,8 @@ void CanonicalNameTest(void) return; } - // print_error - void print_error( const ::rtl::OString& str, FileBase::RC rc ) { @@ -2680,7 +2450,6 @@ void print_error( const ::rtl::OString& str, FileBase::RC rc ) return; } - // main #if defined WNT @@ -2701,7 +2470,6 @@ int MAIN( int argc, char* argv[] ) return -1; } - if (argc==1) { DirectoryOpenAndCloseTest(); @@ -2786,5 +2554,4 @@ int MAIN( int argc, char* argv[] ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/workben/testpip2.cxx b/sal/workben/testpip2.cxx index 21dc18cc50d8..e16d3b03ed63 100644 --- a/sal/workben/testpip2.cxx +++ b/sal/workben/testpip2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -28,7 +27,6 @@ const char pszPipeName[] = "TestPipe"; oslPipe Pipe; - void fail( const char * pszText, int retval ) { fprintf( stderr, "TestPipe Client: %s", pszText ); @@ -36,8 +34,6 @@ void fail( const char * pszText, int retval ) exit( retval ); } - - /* * Teste die Pipe-Implementation in osl */ @@ -57,7 +53,6 @@ int main (void) fail( "unable to open pipe.\n", osl_getLastPipeError(NULL)); - // empfange Daten vom Server nChars = osl_receivePipe( Pipe, szBuffer, 256 ); @@ -81,6 +76,4 @@ int main (void) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/workben/testpipe.cxx b/sal/workben/testpipe.cxx index 10ccbe337676..2e405aaa81e0 100644 --- a/sal/workben/testpipe.cxx +++ b/sal/workben/testpipe.cxx @@ -50,8 +50,6 @@ void fail( const char * pszText, int retval ) exit( retval ); } - - /* * Test the Pipe-Implementation in osl */ @@ -62,7 +60,6 @@ int main (int argc, const char *argv[]) rtl_uString* ustrPipeName=0; rtl_uString* ustrExeName=0; - rtl_uString_newFromAscii(&ustrPipeName,pszPipeName); rtl_uString_newFromAscii(&ustrExeName, "//./tmp/testpip2.exe"); @@ -93,7 +90,6 @@ int main (int argc, const char *argv[]) fail( "unable to connect to client.\n", osl_getLastPipeError( Pipe )); - if( argc > 1 ) { cp = argv[1]; @@ -151,6 +147,4 @@ int main (int argc, const char *argv[]) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/workben/testproc.cxx b/sal/workben/testproc.cxx index 09d477747b04..928ccce60f59 100644 --- a/sal/workben/testproc.cxx +++ b/sal/workben/testproc.cxx @@ -20,7 +20,6 @@ #include #include - #if defined WNT #define MAIN _cdecl main #else @@ -53,5 +52,4 @@ int MAIN (void) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit