Changeset ebddd71 in mainline for uspace/srv/fs/fat/fat_idx.c

Timestamp:

2011-08-24T20:20:55Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ace588a

Parents:

eb660787

Message:

Rename U[IP]H_DK_KEY to U[IP]H_SID_KEY.

File:

• uspace/srv/fs/fat/fat_idx.c (modified) (13 diffs)

uspace/srv/fs/fat/fat_idx.c

@@ -116 +116 @@
 #define UPH_BUCKETS     (1 << UPH_BUCKETS_LOG)
 
-#define UPH_DH_KEY      0
+#define UPH_SID_KEY     0
 #define UPH_PFC_KEY     1
 #define UPH_PDI_KEY     2
@@ -122 +122 @@
 static hash_index_t pos_hash(unsigned long key[])
 {
-        service_id_t service_id = (service_id_t)key[UPH_DH_KEY];
+        service_id_t service_id = (service_id_t)key[UPH_SID_KEY];
         fat_cluster_t pfc = (fat_cluster_t)key[UPH_PFC_KEY];
         unsigned pdi = (unsigned)key[UPH_PDI_KEY];
@@ -150 +150 @@
 static int pos_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-        service_id_t service_id = (service_id_t)key[UPH_DH_KEY];
+        service_id_t service_id = (service_id_t)key[UPH_SID_KEY];
         fat_cluster_t pfc;
         unsigned pdi;
@@ -190 +190 @@
 #define UIH_BUCKETS     (1 << UIH_BUCKETS_LOG)
 
-#define UIH_DH_KEY      0
+#define UIH_SID_KEY     0
 #define UIH_INDEX_KEY   1
 
 static hash_index_t idx_hash(unsigned long key[])
 {
-        service_id_t service_id = (service_id_t)key[UIH_DH_KEY];
+        service_id_t service_id = (service_id_t)key[UIH_SID_KEY];
         fs_index_t index = (fs_index_t)key[UIH_INDEX_KEY];
 
@@ -209 +209 @@
 static int idx_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-        service_id_t service_id = (service_id_t)key[UIH_DH_KEY];
+        service_id_t service_id = (service_id_t)key[UIH_SID_KEY];
         fs_index_t index;
         fat_idx_t *fidx = list_get_instance(item, fat_idx_t, uih_link);
@@ -402 +402 @@
                 
         unsigned long ikey[] = {
-                [UIH_DH_KEY] = service_id,
+                [UIH_SID_KEY] = service_id,
                 [UIH_INDEX_KEY] = fidx->index,
         };
@@ -420 +420 @@
         link_t *l;
         unsigned long pkey[] = {
-                [UPH_DH_KEY] = service_id,
+                [UPH_SID_KEY] = service_id,
                 [UPH_PFC_KEY] = pfc,
                 [UPH_PDI_KEY] = pdi,
@@ -439 +439 @@
                 
                 unsigned long ikey[] = {
-                        [UIH_DH_KEY] = service_id,
+                        [UIH_SID_KEY] = service_id,
                         [UIH_INDEX_KEY] = fidx->index,
                 };
@@ -458 +458 @@
 {
         unsigned long pkey[] = {
-                [UPH_DH_KEY] = idx->service_id,
+                [UPH_SID_KEY] = idx->service_id,
                 [UPH_PFC_KEY] = idx->pfc,
                 [UPH_PDI_KEY] = idx->pdi,
@@ -471 +471 @@
 {
         unsigned long pkey[] = {
-                [UPH_DH_KEY] = idx->service_id,
+                [UPH_SID_KEY] = idx->service_id,
                 [UPH_PFC_KEY] = idx->pfc,
                 [UPH_PDI_KEY] = idx->pdi,
@@ -487 +487 @@
         link_t *l;
         unsigned long ikey[] = {
-                [UIH_DH_KEY] = service_id,
+                [UIH_SID_KEY] = service_id,
                 [UIH_INDEX_KEY] = index,
         };
@@ -509 +509 @@
 {
         unsigned long ikey[] = {
-                [UIH_DH_KEY] = idx->service_id,
+                [UIH_SID_KEY] = idx->service_id,
                 [UIH_INDEX_KEY] = idx->index,
         };
@@ -571 +571 @@
 {
         unsigned long ikey[] = {
-                [UIH_DH_KEY] = service_id
+                [UIH_SID_KEY] = service_id
         };
         unsigned long pkey[] = {
-                [UPH_DH_KEY] = service_id
+                [UPH_SID_KEY] = service_id
         };