From 051e358f1422dffb52f2a47f86afd56351566373 Mon Sep 17 00:00:00 2001
From: ravinsp <33562092+ravinsp@users.noreply.github.com>
Date: Tue, 18 Aug 2020 22:15:12 +0530
Subject: [PATCH] Fixed hpfs hash update issue.

---
 src/hpfs/hpfs.cpp |  18 +++++++++---------
 test/bin/hpfs     | Bin 219288 -> 219288 bytes
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/hpfs/hpfs.cpp b/src/hpfs/hpfs.cpp
index a2d0c2a2..b5b839f4 100644
--- a/src/hpfs/hpfs.cpp
+++ b/src/hpfs/hpfs.cpp
@@ -172,14 +172,14 @@ namespace hpfs
 
     int get_hash(h32 &hash, const std::string_view mount_dir, const std::string_view vpath)
     {
-        std::string path = std::string(mount_dir).append(vpath).append("::hpfs.hmap.hash");
-        int fd = open(path.c_str(), O_RDONLY);
+        const std::string path = std::string(mount_dir).append(vpath).append("::hpfs.hmap.hash");
+        const int fd = open(path.c_str(), O_RDONLY);
         if (fd == -1)
         {
             LOG_ERR << errno << ": Error opening hash file.";
             return -1;
         }
-        int res = read(fd, &hash, sizeof(h32));
+        const int res = read(fd, &hash, sizeof(h32));
         close(fd);
         if (res == -1)
         {
@@ -191,8 +191,8 @@ namespace hpfs
 
     int get_file_block_hashes(std::vector<h32> &hashes, const std::string_view mount_dir, const std::string_view vpath)
     {
-        std::string path = std::string(mount_dir).append(vpath).append("::hpfs.hmap.children");
-        int fd = open(path.c_str(), O_RDONLY);
+        const std::string path = std::string(mount_dir).append(vpath).append("::hpfs.hmap.children");
+        const int fd = open(path.c_str(), O_RDONLY);
         if (fd == -1)
             return -1;
 
@@ -207,7 +207,7 @@ namespace hpfs
         const int children_count = st.st_size / sizeof(h32);
         hashes.resize(children_count);
 
-        int res = read(fd, hashes.data(), st.st_size);
+        const int res = read(fd, hashes.data(), st.st_size);
         close(fd);
         if (res == -1)
         {
@@ -219,8 +219,8 @@ namespace hpfs
 
     int get_dir_children_hashes(std::vector<child_hash_node> &hash_nodes, const std::string_view mount_dir, const std::string_view dir_vpath)
     {
-        std::string path = std::string(mount_dir).append(dir_vpath).append("::hpfs.hmap.children");
-        int fd = open(path.c_str(), O_RDONLY);
+        const std::string path = std::string(mount_dir).append(dir_vpath).append("::hpfs.hmap.children");
+        const int fd = open(path.c_str(), O_RDONLY);
         if (fd == -1)
         {
             LOG_ERR << errno << ": Error opening hash children nodes.";
@@ -238,7 +238,7 @@ namespace hpfs
         const int children_count = st.st_size / sizeof(child_hash_node);
         hash_nodes.resize(children_count);
 
-        int res = read(fd, hash_nodes.data(), st.st_size);
+        const int res = read(fd, hash_nodes.data(), st.st_size);
         close(fd);
         if (res == -1)
         {
diff --git a/test/bin/hpfs b/test/bin/hpfs
index 18565a512be1c80d6febdbd2bc88a3439af8eae8..9f79c1f4739180333bff58b421d1e95df5517c0b 100755
GIT binary patch
delta 1501
zcmYLJYfMx}6rMAe6-4O*x)ymTP(kIf?6PVx)aqIZ(^^v0;Gf1vQfo@I6r!YJ(kL#g
zz24rWR+>TmQCiW0#R|1}sV^3!B1ua?5=%%GNZMu*(zHGzX>q4#?gHH(J2T%o=R4my
zbLQ4GN7OV&G*!|0pS@YycYFKmIUhPwioRX0pUI7TcKUJ+?ahG-PjRkMoC{qg@V4Q+
z0OJ%gjYSvX9ZJJ1Pr{^)|I`c-#<@$-m<E3sn+IVCpoC}t3eOT3Fg?%5)Gq&cRY1tK
z<AZ=0TZQOhd3wUP--q1z(xU<4_Dn)~?59lkmI`6I4(1CnTE<)ML+U&`dN6fhjL4`T
z_63B$j{kWdTrtted$kS-xw)PaX>BF=^LO*r58!)O{cMTl4KppThIxEUMz>0=eb|Dy
zpXminT3+MT5R74J4_cFX;t-@kKHoS5tJ5n#k!f!+&08A?iaKM~(T*~EO=J+mB<lu#
zX$VsHzAQy}Iup_U*HpyDBLQ(!ikcA@S`rYd*N1k`4f!w16a8oR1cXLB6SO@1nsgpL
zi#1(Cn;1QXJEnhLh<nY9V(LB2IKth-FmFwXv}&@Q-a9g*7F;}jH*5D>RBvYxte1;k
zh-MQ|Z!`55|6BaTFm%Q(2$SNx>o5V@P0y)by}?UIAT@msiesJ$VXgL6`SypJvc_Vq
zSG;Y=`U+U9JEr13jx-uaz?VmhXPx}}ae|>OrH3rg!sletM5yK&nbdt~CDRIOnO0QK
zwDKlYen+-%3zqzUf>v4gSOywfrSacyq%d^U3&ZfndV{#x_OgG3FmD{mCU!B`ij-x@
zwBO=yND7GVTSZL$omGz4BF5Ak2V{YKER&|fW*%*)*|3A>+3BkA0Xrd&tlQiD`P^%#
zYr(>Qw9~^;2Q4xTCr1m;@OOM`7Tpco_>C-@0ay6LEV?Et1D&ub8<>ucDE0u)anO{g
z^L3cZ9E2d8%u5_J79MleL0<xcUv$ug@RWBssC((V7tH$1TD|qSpRQ524WuNY1hdph
zp5>%5u!1uub;3h_&`B3VGC%F4j&*J35P08{1)_%P21z(`Z2nqu;)v)hY#P>W&zH<l
zC-LxX8n^brSLi1-Yu=qxOwXOu4`3SU&yol}0Oa%dmN9ku1yt}|+1QqS{6scgSg^@t
z$96oO%8jxnnsKknSqYNelUlFKf~S!#zj0m&^8uI%&|Zf@yv#}$@<<o8L?1CZ24v)(
zMfe%m8qeGMVcC-1n9qMK0k!G2`gp8NU%5p}&@9L03Ejivc+WLRH@<MuhJxAc9|^Iy
zg^(AGO_g-VtfZEog{bNwWKXXUb-1SW3Go}QbNhvOa+i=Iqwg3!qeDD@-=@Sx?X(km
zd~Rr1JWkf6Mo0laWm6W%db$I`ho69u>luW&Ux++PUyGQ<Jc@GJxNB27ViLmfqGk+=
z1(1SBj``;ZS<aj7%3^5aeRgFnylO;cDb^5(<Vh|>R~v4ZVz(|j8bVGemPZOvLvZkf
cfXHo_ssX-KYAmG5(AO&-3se|UOgR?$ADNo6Qvd(}

delta 1380
zcmYLIeNa?Y6u;*_7WrrclubcC70?ux-6a@JO;@6xGcg(2FlCz4hxvgS1&w8n+5-$<
z&zd3UY%$}IAqrVaP>)H))hu+z7(mAf3m0elV;O9w%#2F+cJ5=L_s6^Up7T5BcRqdX
zc3->wcnwdyFjO39+5GkCV{epK9vs;;VAnc|JAAxv0c_JYE;2VRf}U648PnYcH#p>)
zX`jOjoJa3&fIAMn*ba8{&@nhV5B@dFu0jAnL(k9fSK)lsDDkWHJ;56_AtBGRTSGz{
z6LBB<Yy4HkCj@=olZ?L6#RT0YApu-51dCEu*M)>vy93q9AE-v{s|1wF?;aIm<XLPQ
zf}Ckdgiz~$9A#3`{CY?P-^alrD420q3yE)<fwAu8oJnn$WC(U*)-~vKG(<~T$*`)I
z_*BiWO6yPY*K3dpc8m?cJn&#q02a=#cu)HOR@G~pLgVapRu*R{o<2)*Rju!p=K1(>
z0CINDl5E<!4ATD=wkUchB)TR0WE3~IghYL<pY+-(`4`n0!F`)ULTB0-uZ}q(!6W-9
zc&j)gHFQ&r{VNHmTUKiQ6=J+t!3ZC&W6U@dp2lUvkOCan3_}_`h;I+WIRNxtha@P(
z)z=~CzT2B9r%A&pmf@()JbE4cC456<!|#8jn))2R(*~Uwo5wSt0dw=XcY2npmo};T
zQ%6+2`Z!hYyiB`{5q>(l7V}6?h9xvsMyW<=AKkmcrFrciA*}MN`i`*|)q=&@b1A_p
zTd)l;=kbT&Nu1{79$1HuIC)Xbpp&tiacj>6RjhOJr4WhVJNd4J?KZ1rKJx3A#2r|k
z&)36R?9S)8VB%;#Uy_hVAR4NNX^wmn^d>HJ@$7`d&D1-qDdXbVxYfmz;TG<7@!8OY
zU$}S@+{W`R?wzx~jj&eiJ;Ayobf3t@a13T=QV*?e-$j?3&!CE~aC0||;&wMrhuPTZ
z=B{Oa*)F|yLwH>Gw@QbT&o2*4pETx%8Z{v{9HFd9*RwFz!)N9M4iZkrtk<p!dkVQH
zhH*l286Wdd7;oWA9-f<DHDO}8r#6I5jlwd^J=NpSFgexcZ}fY3V%8~{<Nq98EkaoH
zr-oPYP`eOV8OM|G@t?ppRih^@oGfld8m(J-3ZA|MbF*G1hTyxY6rkZ~O`&9r!c~$~
zx9Rdl@YtEydjgU%`!XcrT|2Kdr#`@oN~5pr5TfEM#&XRkcJt>VGdq6}qNbOzO?^T%
z(|Lct5WmnFdr62}1B|UQ`}goh1Kha9q0CIEb~3*Ao+(i&G*WkT#-7KI97=k!??Om?
zM!OhsGM6#$z43Lt*dD2BigLgla42VIq()PhCKXBqkP9Y#BpzaHF19<Bbm+!@r?M25
zm<jnxTm-~nW&ueTnBD@#8JE@=!CDmCo(Ogzf~HOgh+jigt?-GW*;u1#ET<E;nF*@0
GC;mUMM`JPo