mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Use str_hash(). Some cleanup.

Browse Source
This commit is contained in:
Sanel Zukan 2012-10-08 15:40:25 +00:00
parent c39c0718f9
commit b19a713bdf
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
emountd/emountd.cpp
View File

@ -29,6 +29,7 @@
#include <libhal-storage.h> #include <libhal-storage.h>
#include <edelib/List.h> #include <edelib/List.h>
#include <edelib/Missing.h> #include <edelib/Missing.h>
#include <edelib/StrUtil.h>
/* HAL can return NULL as error message if not checked */ /* HAL can return NULL as error message if not checked */
#define CHECK_STR(s) ((s != NULL) ? s : "<unknown>") #define CHECK_STR(s) ((s != NULL) ? s : "<unknown>")
@ -39,6 +40,9 @@
#define EDE_SHUTDOWN_INTERFACE "org.equinoxproject.Shutdown" #define EDE_SHUTDOWN_INTERFACE "org.equinoxproject.Shutdown"
#define EDE_SHUTDOWN_MEMBER "Shutdown" #define EDE_SHUTDOWN_MEMBER "Shutdown"
EDELIB_NS_USING(list)
EDELIB_NS_USING(str_hash)
struct DeviceInfo { struct DeviceInfo {
unsigned int udi_hash; unsigned int udi_hash;
const char* label; const char* label;
@ -58,8 +62,8 @@ struct DeviceAudioInfo {
const char* device_file; const char* device_file;
}; };
typedef edelib::list<unsigned int> UIntList; typedef list<unsigned int> UIntList;
typedef edelib::list<unsigned int>::iterator UIntListIter; typedef list<unsigned int>::iterator UIntListIter;
static int quit_signaled = 0; static int quit_signaled = 0;
static DBusConnection* bus_connection = NULL; static DBusConnection* bus_connection = NULL;
@ -69,24 +73,6 @@ void quit_signal(int sig) {
quit_signaled = 1; quit_signaled = 1;
} }
/* A hash function from Dr.Dobbs Journal. */
unsigned int do_hash(const char* key, int keylen) {
unsigned hash ;
int i;
for (i = 0, hash = 0; i < keylen ;i++) {
hash += (long)key[i] ;
hash += (hash<<10);
hash ^= (hash>>6) ;
}
hash += (hash <<3);
hash ^= (hash >>11);
hash += (hash <<15);
return hash ;
}
void send_dbus_signal_mounted(DeviceInfo* info) { void send_dbus_signal_mounted(DeviceInfo* info) {
int vi; int vi;
dbus_bool_t vb; dbus_bool_t vb;
@ -217,7 +203,7 @@ void device_info_send(LibHalContext* ctx, const char* udi) {
if(drive) { if(drive) {
const char* label = libhal_device_get_property_string(ctx, udi, "volume.label", 0); const char* label = libhal_device_get_property_string(ctx, udi, "volume.label", 0);
const char* dev = libhal_drive_get_device_file(drive); const char* dev = libhal_drive_get_device_file(drive);
unsigned int udi_hash = do_hash(udi, strlen(udi)); unsigned int udi_hash = str_hash(udi);
/* for audio CD's we send special signals */ /* for audio CD's we send special signals */
if(libhal_volume_disc_has_audio(vol) && !libhal_volume_disc_has_data(vol)) { if(libhal_volume_disc_has_audio(vol) && !libhal_volume_disc_has_data(vol)) {
@ -280,7 +266,7 @@ void device_added(LibHalContext* ctx, const char* udi) {
} }
void device_removed(LibHalContext* ctx, const char* udi) { void device_removed(LibHalContext* ctx, const char* udi) {
unsigned int udi_hash = do_hash(udi, strlen(udi)); unsigned int udi_hash = str_hash(udi);
/* signal audio CD removal if udi match ours */ /* signal audio CD removal if udi match ours */
UIntListIter it = known_audio_udis.begin(), it_end = known_audio_udis.end(); UIntListIter it = known_audio_udis.begin(), it_end = known_audio_udis.end();