[prev in list] [next in list] [prev in thread] [next in thread] 

List:       haiku-commits
Subject:    [haiku-commits] haiku: hrev50558 - src/add-ons/kernel/file_systems/nfs headers/os/locale
From:       pulkomandy () pulkomandy ! tk
Date:       2016-09-27 19:03:20
Message-ID: 20160927190321.330635C230F () vmrepo ! haiku-os ! org
[Download RAW message or body]

hrev50558 adds 2 changesets to branch 'master'
old head: a71b10d7602ef81b776a900631473f26961d68c3
new head: 9c3eb71b51558533c3e36d2dcad848cc15178cf2
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=9c3eb71b5155+%5Ea71b10d7602e

----------------------------------------------------------------------------

c4da848565f6: BTextEncoding: even more style fixes.

9c3eb71b5155: NFS: set block size as reported from server.
  
  Fixes #9787.

                             [ Adrien Destugues <pulkomandy@pulkomandy.tk> ]

----------------------------------------------------------------------------

2 files changed, 3 insertions(+), 3 deletions(-)
headers/os/locale/TextEncoding.h                 | 3 +--
src/add-ons/kernel/file_systems/nfs/nfs_add_on.c | 3 ++-

############################################################################

Commit:      c4da848565f68bf89b4b2b002ea176ef29b89818
URL:         http://cgit.haiku-os.org/haiku/commit/?id=c4da848565f6
Author:      Adrien Destugues <pulkomandy@pulkomandy.tk>
Date:        Tue Sep 27 18:41:26 2016 UTC

BTextEncoding: even more style fixes.

----------------------------------------------------------------------------

diff --git a/headers/os/locale/TextEncoding.h b/headers/os/locale/TextEncoding.h
index e9f7a1a..6ec3903 100644
--- a/headers/os/locale/TextEncoding.h
+++ b/headers/os/locale/TextEncoding.h
@@ -19,8 +19,7 @@ struct UConverter;
 namespace BPrivate {
 
 
-class BTextEncoding
-{
+class BTextEncoding {
 public:
 								BTextEncoding(BString name);
 								BTextEncoding(const char* data, size_t length);

############################################################################

Revision:    hrev50558
Commit:      9c3eb71b51558533c3e36d2dcad848cc15178cf2
URL:         http://cgit.haiku-os.org/haiku/commit/?id=9c3eb71b5155
Author:      Adrien Destugues <pulkomandy@pulkomandy.tk>
Date:        Tue Sep 27 19:02:07 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/9787

NFS: set block size as reported from server.

Fixes #9787.

----------------------------------------------------------------------------

diff --git a/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c \
b/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c index 62ef40d..c4bbf2d 100644
--- a/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c
+++ b/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c
@@ -666,7 +666,8 @@ get_nfs_attr(struct XDRInPacket *reply, struct stat *st)
 	st->st_blksize=XDRInPacketGetInt32(reply);
 #endif
 	st->st_rdev=XDRInPacketGetInt32(reply);
-	XDRInPacketGetInt32(reply);	// blocks
+	// XDRInPacketGetInt32(reply);	// blocks
+	st->st_blocks=XDRInPacketGetInt32(reply);
 	XDRInPacketGetInt32(reply);	// fsid
 	st->st_ino=XDRInPacketGetInt32(reply);
 	st->st_atime=XDRInPacketGetInt32(reply);


[prev in list] [next in list] [prev in thread] [next in thread]