Changeset b2fa2d86 in mainline for uspace

Timestamp:

2013-03-26T15:06:35Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea15a89a

Parents:

8a26f82 (diff), 5c4356b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

uspace/srv/fs

Files:

• exfat/exfat_fat.c (modified) (1 diff)
• fat/fat_fat.c (modified) (5 diffs)
• mfs/mfs_ops.c (modified) (2 diffs)

uspace/srv/fs/exfat/exfat_fat.c

@@ -401 +401 @@
 {
         service_id_t service_id = nodep->idx->service_id;
-        exfat_cluster_t lastc;
+        exfat_cluster_t lastc = 0;
         int rc;
 

uspace/srv/fs/fat/fat_fat.c

@@ -128 +128 @@
 {
         fat_cluster_t firstc = nodep->firstc;
-        fat_cluster_t currc;
+        fat_cluster_t currc = 0;
         aoff64_t relbn = bn;
         int rc;
@@ -194 +194 @@
         uint32_t clusters;
         uint32_t max_clusters;
-        fat_cluster_t c;
+        fat_cluster_t c = 0;
         int rc;
 
@@ -679 +679 @@
         fat_cluster_t *lifo;    /* stack for storing free cluster numbers */
         unsigned found = 0;     /* top of the free cluster number stack */
-        fat_cluster_t clst, value, clst_last1 = FAT_CLST_LAST1(bs);
+        fat_cluster_t clst;
+        fat_cluster_t value = 0;
+        fat_cluster_t clst_last1 = FAT_CLST_LAST1(bs);
         int rc = EOK;
 
@@ -783 +785 @@
 {
         service_id_t service_id = nodep->idx->service_id;
-        fat_cluster_t lastc;
+        fat_cluster_t lastc = 0;
         uint8_t fatno;
         int rc;
@@ -907 +909 @@
 int fat_sanity_check(fat_bs_t *bs, service_id_t service_id)
 {
-        fat_cluster_t e0, e1;
+        fat_cluster_t e0 = 0;
+        fat_cluster_t e1 = 0;
         unsigned fat_no;
         int rc;

uspace/srv/fs/mfs/mfs_ops.c

@@ -773 +773 @@
 {
         int rc;
-        fs_node_t *fn;
+        fs_node_t *fn = NULL;
 
         rc = mfs_node_get(&fn, service_id, index);
@@ -1108 +1108 @@
 mfs_sync(service_id_t service_id, fs_index_t index)
 {
-        fs_node_t *fn;
+        fs_node_t *fn = NULL;
         int rc = mfs_node_get(&fn, service_id, index);
         if (rc != EOK)