[Libreoffice-commits] .: 3 commits - desktop/source Repository.mk sal/inc sal/rtl sal/typesconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 14 08:21:23 PST 2013
Repository.mk | 1
desktop/source/migration/migration.cxx | 7
sal/inc/sal/types.h | 1
sal/rtl/source/locale.cxx | 41 ---
sal/typesconfig/typesconfig.c | 445 ---------------------------------
5 files changed, 15 insertions(+), 480 deletions(-)
New commits:
commit 34d63e34d9f65ce83564ac310c5857d17147e27f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 14 17:20:42 2013 +0100
Use std::back_inserter
Change-Id: If87f96b5c616ee6ec70de6aa7f2a58c044f04f3a
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 82f573f..9005d20 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -20,6 +20,7 @@
#include "sal/config.h"
#include <algorithm>
+#include <iterator>
#include <map>
#include <new>
#include <set>
@@ -712,10 +713,8 @@ strings_v subtract(strings_v const & va, strings_v const & vb) {
strings_v b(vb);
std::sort(b.begin(), b.end());
strings_v::iterator be(std::unique(b.begin(), b.end()));
- strings_v c(ae - a.begin());
- strings_v::iterator ce(
- std::set_difference(a.begin(), ae, b.begin(), be, c.begin()));
- c.resize(ce - c.begin());
+ strings_v c;
+ std::set_difference(a.begin(), ae, b.begin(), be, std::back_inserter(c));
return c;
}
commit e19242c377aa548173e75b57f01108972194f1db
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 14 15:58:13 2013 +0100
Remove obsolete typesconfig
Change-Id: Ic3fd543351637c610621814bb8c8f4fa3cab64fc
diff --git a/Repository.mk b/Repository.mk
index ddf2785..5907c3e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
stringex \
transex3 \
treex \
- typesconfig \
$(if $(filter UCPP,$(BUILD_TYPE)),\
ucpp \
) \
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 125c098..b04126a 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -27,7 +27,6 @@
#include <config_global.h>
#endif
-/* Grab __SIZEOFxxx constants from typesconfig tool on Unix */
#if defined UNX
#include <sal/typesizes.h>
#elif defined(WNT)
diff --git a/sal/typesconfig/typesconfig.c b/sal/typesconfig/typesconfig.c
deleted file mode 100644
index 473f07a..0000000
--- a/sal/typesconfig/typesconfig.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-
-#include <stdarg.h>
-
-#include <signal.h>
-#include <setjmp.h>
-
-#define printTypeSize(Type,Name) printf( "sizeof(%s)\t\t= %d\n", Name, (int) sizeof (Type) )
-
-#define isSignedType(Type) (((Type)-1) < 0)
-#define printTypeSign(Type,Name) printf( "%s\t\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name )
-
-
-/*************************************************************************
-|*
-|* IsBigEndian()
-|*
-|* Beschreibung True, wenn CPU BigEndian ist
-|*
-*************************************************************************/
-int IsBigEndian()
-{
- long l = 1;
- return ! *(char*)&l;
-}
-
-/*************************************************************************
-|*
-|* Typdeclarations for memory access test functions
-|*
-*************************************************************************/
-typedef enum { t_char, t_short, t_int, t_long, t_double } Type;
-typedef int (*TestFunc)( Type, void* );
-
-
-/*************************************************************************
-|*
-|* PrintArgs()
-|*
-|* Beschreibung Testfunktion fuer variable Parameter
-|*
-*************************************************************************/
-void PrintArgs( int p, ... )
-{
- int value;
- va_list ap;
-
- va_start( ap, p );
-
- printf( "value = %d", p );
-
- while ( ( value = va_arg(ap, int) ) != 0 )
- printf( " %d", value );
-
- printf( "\n" );
- va_end(ap);
-}
-
-/*************************************************************************
-|*
-|* SignalHdl()
-|*
-|* Beschreibung faengt SIGBUS und SIGSEGV in check() ab
-|*
-*************************************************************************/
-
-static sigjmp_buf jmpbuf;
-static volatile sig_atomic_t hit;
-
-void SignalHdl( int sig )
-{
- (void) sig; // ignored
- hit = 1;
- siglongjmp(jmpbuf, 0);
-}
-
-/*************************************************************************
-|*
-|* check()
-|*
-|* Beschreibung Testet MemoryZugriff (read/write)
-|*
-*************************************************************************/
-int check( TestFunc func, Type eT, void* p )
-{
- hit = 0;
- if (sigsetjmp(jmpbuf, 1) == 0) {
- struct sigaction sa;
- sa.sa_handler = SignalHdl;
- sigemptyset(&sa.sa_mask);
- sa.sa_flags = 0;
- if (sigaction(SIGBUS, &sa, NULL) != 0 ||
- sigaction(SIGSEGV, &sa, NULL) != 0)
- {
- abort();
- }
- func(eT, p);
- sa.sa_handler = SIG_DFL;
- if (sigaction(SIGBUS, &sa, NULL) != 0 ||
- sigaction(SIGSEGV, &sa, NULL) != 0)
- {
- abort();
- }
- }
- return hit ? -1 : 0;
-}
-
-/*************************************************************************
-|*
-|* GetAtAddress()
-|*
-|* Beschreibung memory read access
-|*
-*************************************************************************/
-#if defined(IA64) || defined(ARM32) || defined(HPPA) || defined(AXP)
-
-int forceerror()
-{
-#if defined(ARM32)
-// workaround for qemu-user
- hit = 1;
-#else
- raise (SIGBUS);
-#endif
- return 1;
-}
-
-int GetAtAddress( Type eT, void* p )
-{
- switch ( eT )
- {
- case t_char: return *((char*)p);
- case t_short: if ((long)p % sizeof(short)) return forceerror(); else return *((short*)p);
- case t_int: if ((long)p % sizeof(int)) return forceerror(); else return *((int*)p);
- case t_long: if ((long)p % sizeof(long)) return forceerror(); else return *((long*)p);
- case t_double: if ((long)p % sizeof(double)) return forceerror(); else return *((double*)p);
- }
- abort();
-}
-
-#else
-static int dummy(void* unused);
-
-int GetAtAddress( Type eT, void* p )
-{
- switch ( eT )
- {
- case t_char: { char x = *(char*)p; return dummy(&x); }
- case t_short: { short x = *(short*)p; return dummy(&x); }
- case t_int: { int x = *(int*)p; return dummy(&x); }
- case t_long: { long x = *(long*)p; return dummy(&x); }
- case t_double: { double x = *(double*)p; return dummy(&x); }
- }
- abort();
-}
-
-int dummy(void* unused)
-{
- (void)unused;
- return 0;
-}
-
-#endif
-/*************************************************************************
-|*
-|* SetAtAddress()
-|*
-|* Beschreibung memory write access
-|*
-*************************************************************************/
-int SetAtAddress( Type eT, void* p )
-{
- switch ( eT )
- {
- case t_char: return *((char*)p) = 0;
- case t_short: return *((short*)p) = 0;
- case t_int: return *((int*)p) = 0;
- case t_long: return *((long*)p) = 0;
- case t_double: return *((double*)p)= 0;
- }
- abort();
-}
-
-char* TypeName( Type eT )
-{
- switch ( eT )
- {
- case t_char: return "char";
- case t_short: return "short";
- case t_int: return "int";
- case t_long: return "long";
- case t_double: return "double";
- }
- abort();
-}
-
-/*************************************************************************
-|*
-|* Check(Get|Set)Access()
-|*
-|* Beschreibung Testet MemoryZugriff (read/write)
-|* Zugriffsverletzungen werden abgefangen
-|*
-*************************************************************************/
-int CheckGetAccess( Type eT, void* p )
-{
- int b;
- b = -1 != check( (TestFunc)GetAtAddress, eT, p );
-#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr,
- "%s read %s at %p\n",
- (b? "can" : "can not" ), TypeName(eT), p );
-#endif
- return b;
-}
-int CheckSetAccess( Type eT, void* p )
-{
- int b;
-
- b = -1 != check( (TestFunc)SetAtAddress, eT, p );
-#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr,
- "%s write %s at %p\n",
- (b? "can" : "can not" ), TypeName(eT), p );
-#endif
- return b;
-}
-
-/*************************************************************************
-|*
-|* GetAlignment()
-|*
-|* Beschreibung Bestimmt das Alignment verschiedener Typen
-|*
-*************************************************************************/
-int GetAlignment( Type eT )
-{
- char a[ 16*8 ];
- long p = (long)(void*)a;
- int i;
-
- /* clear a[...] to set legal value for double access */
- for ( i = 0; i < 16*8; i++ )
- a[i] = 0;
-
- p = ( p + 0xF ) & ~0xF;
- for ( i = 1; i < 16; i++ )
- if ( CheckGetAccess( eT, (void*)(p+i) ) )
- return i;
- return 0;
-}
-
-/*************************************************************************
-|*
-|* struct Description
-|*
-|* Beschreibung Beschreibt die Parameter der Architektur
-|*
-*************************************************************************/
-struct Description
-{
- int bBigEndian;
- int nAlignment[3]; /* 2,4,8 */
-};
-
-/*************************************************************************
-|*
-|* Description_Ctor()
-|*
-|* Beschreibung Bestimmt die Parameter der Architektur
-|*
-*************************************************************************/
-void Description_Ctor( struct Description* pThis )
-{
- pThis->bBigEndian = IsBigEndian();
-
- if ( sizeof(short) != 2 )
- abort();
- pThis->nAlignment[0] = GetAlignment( t_short );
- if ( sizeof(int) != 4 )
- abort();
- pThis->nAlignment[1] = GetAlignment( t_int );
-
- if ( sizeof(long) == 8 )
- pThis->nAlignment[2] = GetAlignment( t_long );
- else if ( sizeof(double) == 8 )
- pThis->nAlignment[2] = GetAlignment( t_double );
- else
- abort();
-}
-
-/*************************************************************************
-|*
-|* Description_Print()
-|*
-|* Beschreibung Schreibt die Parameter der Architektur als Header
-|*
-*************************************************************************/
-void Description_Print( struct Description* pThis, char* name )
-{
- int i;
- FILE* f = fopen( name, "w" );
- if( ! f ) {
- fprintf( stderr, "Unable to open file %s: %s\n", name, strerror( errno ) );
- exit( 99 );
- }
- fprintf( f, "/* This file is autogenerated from the 'typesconfig' program\n * in the sal module\n */\n\n" );
-
-/* Disabled for now in preference to big/little endian defines in <osl/endian.h> fa (2004-03-15) */
-/* fprintf( f, "#define SAL_TYPES_%s\n", pThis->bBigEndian ? "BIGENDIAN" : "LITTLEENDIAN" ); */
-
- for ( i = 0; i < 3; i++ )
- fprintf( f, "#define SAL_TYPES_ALIGNMENT%d\t%d\n", 1 << (i+1), pThis->nAlignment[i] );
- fprintf( f, "#define SAL_TYPES_SIZEOFSHORT\t%d\n", (int) sizeof( short ) );
- fprintf( f, "#define SAL_TYPES_SIZEOFINT\t%d\n", (int) sizeof( int ) );
- fprintf( f, "#define SAL_TYPES_SIZEOFLONG\t%d\n", (int) sizeof( long ) );
- fprintf( f, "#define SAL_TYPES_SIZEOFLONGLONG\t%d\n", (int) sizeof( long long ) );
- fprintf( f, "#define SAL_TYPES_SIZEOFPOINTER\t%d\n", (int) sizeof( void* ) );
-
-/* Disabled for now, becuase OOo code assumes sizeof(double) == 8 and this is not
- * likely to change any time soon. fa (2004-03-15)
- */
-/* fprintf( f, "#define SAL_TYPES_SIZEOFDOUBLE\t%d\n", sizeof( double ) );*/
-
- fclose( f );
-}
-
-/*************************************************************************
-|*
-|* InfoMemoryAccess()
-|*
-|* Beschreibung Informeller Bytezugriffstest
-|*
-*************************************************************************/
-void InfoMemoryAccess( char* p )
-{
- if ( CheckGetAccess( t_char, p ) )
- printf( "can read address %p\n", p );
- else
- printf( "cannot read address %p\n", p );
-
- if ( CheckSetAccess( t_char, p ) )
- printf( "can write address %p\n", p );
- else
- printf( "cannot write address %p\n", p );
-}
-
-/*************************************************************************
-|*
-|* InfoMemoryTypeAccess()
-|*
-|* Beschreibung Informeller Zugriffstest verschiedener Typen
-|*
-*************************************************************************/
-void InfoMemoryTypeAccess( Type eT )
-{
- char a[64];
- int i;
-
- /* clear a[...] to set legal value for double access */
- for ( i = 0; i < 64; i++ )
- a[i] = 0;
-
- for ( i = 56; i >= 7; i >>= 1 )
- {
- if ( CheckGetAccess(eT, (long*)&a[i]) )
- printf( "Access %s on %i-Aligned Address : OK\n", TypeName(eT), i / 7 );
- else
- printf( "Access %s on %i-Aligned Address : ERROR\n", TypeName(eT), i / 7 );
- }
-}
-/************************************************************************
- *
- * Use C code to determine the characteristics of the building platform.
- *
- ************************************************************************/
-int main( int argc, char* argv[] )
-{
- printTypeSign( char, "char" );
- printTypeSign( short, "short" );
- printTypeSign( int, "int" );
- printTypeSign( long, "long" );
- printTypeSign( long long, "long long" );
-
- printTypeSize( short, "short" );
- printTypeSize( int, "int" );
- printTypeSize( long, "long" );
- printTypeSize( long long, "long long" );
- printTypeSize( float, "float" );
- printTypeSize( double, "double" );
- printTypeSize( void *, "void *" );
-
- if ( IsBigEndian() )
- printf( "BIGENDIAN (Sparc, RS6000, IP22, IP32, PowerPC(BE))\n" );
- else
- printf( "LITTLEENDIAN (Intel, x86-64, PowerPC(LE))\n" );
-
- /* PrintArgs( 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 ); */
-
- if ( argc > 1 )
- {
- struct Description description;
- Description_Ctor( &description );
- Description_Print( &description, argv[1] );
- }
- {
- char* p = NULL;
- InfoMemoryAccess( p );
- p = (char*)&p;
- InfoMemoryAccess( p );
- InfoMemoryTypeAccess( t_short );
- InfoMemoryTypeAccess( t_int );
- InfoMemoryTypeAccess( t_long );
- InfoMemoryTypeAccess( t_double );
- }
-
- exit( 0 );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6bbe55c4f563bd6944d276760d7c30527136313b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 14 15:13:50 2013 +0100
Simplify code
Change-Id: Ib35cba4544726c1653d36072f3499dffec3cced3
diff --git a/sal/rtl/source/locale.cxx b/sal/rtl/source/locale.cxx
index e9b9e15..0c47b95 100644
--- a/sal/rtl/source/locale.cxx
+++ b/sal/rtl/source/locale.cxx
@@ -121,37 +121,20 @@ extern "C" rtl_Locale* rtl_hashtable_add(RTL_HASHTABLE** table, rtl_Locale* valu
key = rtl_hashfunc(*table, value->HashCode);
- if (!(*table)->Table[key])
+ RTL_HASHENTRY **pEntry = &(*table)->Table[key];
+ while (*pEntry)
{
- RTL_HASHENTRY *newEntry = (RTL_HASHENTRY*)rtl_allocateMemory( sizeof(RTL_HASHENTRY) );
- newEntry->Entry = value;
- newEntry->Next = NULL;
- (*table)->Table[key] = newEntry;
- (*table)->Elements++;
- return NULL;
- } else
- {
- RTL_HASHENTRY *pEntry = (*table)->Table[key];
- RTL_HASHENTRY *newEntry = NULL;
-
- while (pEntry)
- {
- if (value->HashCode == pEntry->Entry->HashCode)
- return pEntry->Entry;
-
- if (!pEntry->Next)
- break;
-
- pEntry = pEntry->Next;
- }
-
- newEntry = (RTL_HASHENTRY*)rtl_allocateMemory( sizeof(RTL_HASHENTRY) );
- newEntry->Entry = value;
- newEntry->Next = NULL;
- pEntry->Next = newEntry;
- (*table)->Elements++;
- return NULL;
+ if (value->HashCode == (*pEntry)->Entry->HashCode)
+ return (*pEntry)->Entry;
+ pEntry = &(*pEntry)->Next;
}
+
+ RTL_HASHENTRY *newEntry = (RTL_HASHENTRY*)rtl_allocateMemory( sizeof(RTL_HASHENTRY) );
+ newEntry->Entry = value;
+ newEntry->Next = NULL;
+ *pEntry = newEntry;
+ (*table)->Elements++;
+ return NULL;
}
sal_Bool rtl_hashtable_grow(RTL_HASHTABLE** table)
More information about the Libreoffice-commits
mailing list