Mageia Bugzilla – Attachment 2772 Details for
Bug 6647
mediatomb segfaults on avutil - probably mga2 patch was not ported over
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
patch to let mediatomb compile with newest gcc
mediatomb-0.12.1-hash.patch (text/plain), 3.90 KB, created by
Joseph Wang
on 2012-09-09 10:59:40 CEST
(
hide
)
Description:
patch to let mediatomb compile with newest gcc
Filename:
MIME Type:
Creator:
Joseph Wang
Created:
2012-09-09 10:59:40 CEST
Size:
3.90 KB
patch
obsolete
>--- a/src/hash/dbo_hash.h 2010-03-25 22:58:07.000000000 +0800 >+++ b/src/hash/dbo_hash.h 2012-09-08 00:33:27.958713253 +0800 >@@ -106,7 +106,7 @@ > inline bool remove(KT key) > { > struct dbo_hash_slot<KT, VT> *slot; >- if (! search(key, &slot)) >+ if (! this->search(key, &slot)) > return false; > slot->key = deletedKey; > slot->value->release(); >@@ -136,7 +136,7 @@ > inline void put(KT key, zmm::Ref<VT> value) > { > struct dbo_hash_slot<KT, VT> *slot; >- search(key, &slot); >+ this->search(key, &slot); > put(key, (hash_slot_t)slot, value); > } > void put(KT key, hash_slot_t destSlot, zmm::Ref<VT> value) >@@ -162,7 +162,7 @@ > inline zmm::Ref<VT> get(KT key) > { > struct dbo_hash_slot<KT, VT> *slot; >- bool found = search(key, &slot); >+ bool found = this->search(key, &slot); > if (found) > return zmm::Ref<VT>(slot->value); > else >@@ -174,7 +174,7 @@ > inline zmm::Ref<VT> get(KT key, hash_slot_t *destSlot) > { > struct dbo_hash_slot<KT, VT> **slot = (struct dbo_hash_slot<KT, VT> **)destSlot; >- bool found = search(key, slot); >+ bool found = this->search(key, slot); > if (found) > return zmm::Ref<VT>((*slot)->value); > else >--- a/src/hash/dbr_hash.h 2010-03-25 22:58:07.000000000 +0800 >+++ b/src/hash/dbr_hash.h 2012-09-08 00:40:44.331842892 +0800 >@@ -124,7 +124,7 @@ > inline bool remove(KT key) > { > struct dbr_hash_slot<KT> *slot; >- if (! search(key, &slot)) >+ if (! this->search(key, &slot)) > return false; > slot->key = deletedKey; > int array_slot = slot->array_slot; >@@ -134,7 +134,7 @@ > return true; > } > data_array[array_slot] = data_array[--this->count]; >- if (! search(data_array[array_slot], &slot)) >+ if (! this->search(data_array[array_slot], &slot)) > { > log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count); > throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable")); >@@ -146,7 +146,7 @@ > inline void put(KT key) > { > struct dbr_hash_slot<KT> *slot; >- if (! search(key, &slot)) >+ if (! this->search(key, &slot)) > { > #ifdef TOMBDEBUG > if (this->count >= realCapacity) >@@ -194,7 +194,7 @@ > inline bool exists(KT key) > { > struct dbr_hash_slot<KT> *slot; >- return search(key, &slot); >+ return this->search(key, &slot); > } > > /* >--- a/src/hash/dso_hash.h 2010-03-25 22:58:07.000000000 +0800 >+++ b/src/hash/dso_hash.h 2012-09-08 00:49:01.221407214 +0800 >@@ -100,7 +100,7 @@ > inline bool remove(zmm::String key) > { > struct dso_hash_slot<VT> *slot; >- if (! search(key, &slot)) >+ if (! this->search(key, &slot)) > return false; > slot->key->release(); > slot->value->release(); >@@ -112,7 +112,7 @@ > inline void put(zmm::String key, zmm::Ref<VT> value) > { > struct dso_hash_slot<VT> *slot; >- search(key, &slot); >+ this->search(key, &slot); > put(key, (hash_slot_t)slot, value); > } > void put(zmm::String key, hash_slot_t destSlot, zmm::Ref<VT> value) >@@ -141,7 +141,7 @@ > inline zmm::Ref<VT> get(zmm::String key) > { > struct dso_hash_slot<VT> *slot; >- bool found = search(key, &slot); >+ bool found = this->search(key, &slot); > if (found) > return zmm::Ref<VT>(slot->value); > else >@@ -153,7 +153,7 @@ > inline zmm::Ref<VT> get(zmm::String key, hash_slot_t *destSlot) > { > struct dso_hash_slot<VT> **slot = (struct dso_hash_slot<VT> **)destSlot; >- bool found = search(key, slot); >+ bool found = this->search(key, slot); > if (found) > return zmm::Ref<VT>((*slot)->value); > else
--- a/src/hash/dbo_hash.h 2010-03-25 22:58:07.000000000 +0800 +++ b/src/hash/dbo_hash.h 2012-09-08 00:33:27.958713253 +0800 @@ -106,7 +106,7 @@ inline bool remove(KT key) { struct dbo_hash_slot<KT, VT> *slot; - if (! search(key, &slot)) + if (! this->search(key, &slot)) return false; slot->key = deletedKey; slot->value->release(); @@ -136,7 +136,7 @@ inline void put(KT key, zmm::Ref<VT> value) { struct dbo_hash_slot<KT, VT> *slot; - search(key, &slot); + this->search(key, &slot); put(key, (hash_slot_t)slot, value); } void put(KT key, hash_slot_t destSlot, zmm::Ref<VT> value) @@ -162,7 +162,7 @@ inline zmm::Ref<VT> get(KT key) { struct dbo_hash_slot<KT, VT> *slot; - bool found = search(key, &slot); + bool found = this->search(key, &slot); if (found) return zmm::Ref<VT>(slot->value); else @@ -174,7 +174,7 @@ inline zmm::Ref<VT> get(KT key, hash_slot_t *destSlot) { struct dbo_hash_slot<KT, VT> **slot = (struct dbo_hash_slot<KT, VT> **)destSlot; - bool found = search(key, slot); + bool found = this->search(key, slot); if (found) return zmm::Ref<VT>((*slot)->value); else --- a/src/hash/dbr_hash.h 2010-03-25 22:58:07.000000000 +0800 +++ b/src/hash/dbr_hash.h 2012-09-08 00:40:44.331842892 +0800 @@ -124,7 +124,7 @@ inline bool remove(KT key) { struct dbr_hash_slot<KT> *slot; - if (! search(key, &slot)) + if (! this->search(key, &slot)) return false; slot->key = deletedKey; int array_slot = slot->array_slot; @@ -134,7 +134,7 @@ return true; } data_array[array_slot] = data_array[--this->count]; - if (! search(data_array[array_slot], &slot)) + if (! this->search(data_array[array_slot], &slot)) { log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count); throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable")); @@ -146,7 +146,7 @@ inline void put(KT key) { struct dbr_hash_slot<KT> *slot; - if (! search(key, &slot)) + if (! this->search(key, &slot)) { #ifdef TOMBDEBUG if (this->count >= realCapacity) @@ -194,7 +194,7 @@ inline bool exists(KT key) { struct dbr_hash_slot<KT> *slot; - return search(key, &slot); + return this->search(key, &slot); } /* --- a/src/hash/dso_hash.h 2010-03-25 22:58:07.000000000 +0800 +++ b/src/hash/dso_hash.h 2012-09-08 00:49:01.221407214 +0800 @@ -100,7 +100,7 @@ inline bool remove(zmm::String key) { struct dso_hash_slot<VT> *slot; - if (! search(key, &slot)) + if (! this->search(key, &slot)) return false; slot->key->release(); slot->value->release(); @@ -112,7 +112,7 @@ inline void put(zmm::String key, zmm::Ref<VT> value) { struct dso_hash_slot<VT> *slot; - search(key, &slot); + this->search(key, &slot); put(key, (hash_slot_t)slot, value); } void put(zmm::String key, hash_slot_t destSlot, zmm::Ref<VT> value) @@ -141,7 +141,7 @@ inline zmm::Ref<VT> get(zmm::String key) { struct dso_hash_slot<VT> *slot; - bool found = search(key, &slot); + bool found = this->search(key, &slot); if (found) return zmm::Ref<VT>(slot->value); else @@ -153,7 +153,7 @@ inline zmm::Ref<VT> get(zmm::String key, hash_slot_t *destSlot) { struct dso_hash_slot<VT> **slot = (struct dso_hash_slot<VT> **)destSlot; - bool found = search(key, slot); + bool found = this->search(key, slot); if (found) return zmm::Ref<VT>((*slot)->value); else
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 6647
:
2771
| 2772 |
2793
|
2798