debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Linux rpc problems with new glibc

Browse Source
This commit is contained in:
Ulrich Wilkens
2018-05-31 22:50:44 +02:00
committed by Jon Trulson
parent 16fbb15ecc
commit 07f272122d
49 changed files with 93 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureSet.C
View File

@@ -81,7 +81,7 @@ FeatureSet::evaluate(FeatureSet *result_set) const
result_set->append(new Feature(next.key()->name(),
value));
}
mcatch_noarg(badEvaluationException)
mcatch_noarg(badEvaluationException&)
{
/* do nothing...we just ignore any that will not evaluate */
}

2
cde/programs/dtinfo/DtMmdb/dstr/memory_pool.h
View File

@@ -139,7 +139,7 @@ protected:
};
#ifdef C_API
#define g_memory_pool (*g_memory_pool_ptr)
#define g_memory_pool *g_memory_pool_ptr
extern memory_pool* g_memory_pool_ptr;
#endif

4
cde/programs/dtinfo/DtMmdb/dynhash/data_t.C
View File

@@ -349,12 +349,12 @@ int data_t::slot_num(int k, int rotate, int prime, int M )
void* data_t::operator new( size_t x )
{
//return (void*)data_t_space_pool.alloc(x);
return (void*)g_memory_pool.alloc(x);
return (void*)(g_memory_pool).alloc(x);
}
void data_t::operator delete( void* ptr )
{
//data_t_space_pool.free((char*)ptr);
g_memory_pool.free((char*)ptr);
(g_memory_pool).free((char*)ptr);
}

12
cde/programs/dtinfo/DtMmdb/object/long_pstring.C
View File

@@ -96,15 +96,15 @@ long_pstring::extract(int left, int right, char* sink)
)
v_str_index = new chunks_index(storage_ptr, v_str_ptr.loc);
if ( v_str_index ) {
if ( v_str_index ) {
str_index_record_t* anchor = v_str_index -> chunk_location(left);
str_index_record_t* anchor = v_str_index -> chunk_location(left);
//debug(cerr, left - anchor -> str_offset);
storage_ptr ->
readString(anchor -> loc, sink,
right-left, left - anchor -> str_offset
);
storage_ptr ->
readString(anchor -> loc, sink,
right-left, left - anchor -> str_offset
);
} else

4
cde/programs/dtinfo/DtMmdb/oliasdb/c_api_common.C
View File

@@ -136,7 +136,11 @@ void DtMmdbQuit()
}
#if __cplusplus < 201103L
void* operator new( size_t sz ) throw(std::bad_alloc)
#else
void* operator new( size_t sz )
#endif
{
void* p = (void*)malloc(sz);
//printf("a::operator new called(). sz= %d, allo=%x\n", sz, p);

2
cde/programs/dtinfo/DtMmdb/oliasdb/user_base.C
View File

@@ -160,7 +160,7 @@ user_base::checking_status_t user_base::check_mode()
user_base::checking_status_t user_base::check_lock()
{
char lock_dir[PATHSIZ];
char lock_dir[PATHSIZ+5];
int len;
snprintf(lock_dir, sizeof(lock_dir), "%s/%s", base_path, LOCK_DIR);

4
cde/programs/dtinfo/DtMmdb/storage/heap_comp_funcs.C
View File

@@ -75,12 +75,12 @@ Boolean fbytes_t_eq(const void* x, const void* y)
void* fbytes_t::operator new( size_t x )
{
//return (void*)heap_cell_space_pool.alloc(x);
return (void*)g_memory_pool.alloc(x);
return (void*)(g_memory_pool).alloc(x);
}
void fbytes_t::operator delete( void* ptr )
{
//heap_cell_space_pool.free((char*)ptr);
g_memory_pool.free((char*)ptr);
(g_memory_pool).free((char*)ptr);
}

2
cde/programs/dtinfo/DtMmdb/utility/buffer.C
View File

@@ -186,7 +186,7 @@ buffer& buffer::skip(int i)
{
if ( i + v_aptr > v_eptr )
MESSAGE(cerr, "buffer::skip(): underflow");
throw ( CASTBNDEXCEPT boundaryException( long(v_aptr), long(v_eptr), long(i + v_aptr) ));
throw ( CASTBNDEXCEPT boundaryException( long(v_aptr), long(v_eptr), long(i + v_aptr) ));
v_aptr += i;
return *this;