Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[cosmetics] indenting

  • Loading branch information...
commit 40086ae9fbcde9b980315bed6c1be2b2f37c89a0 1 parent 31208ef
Jonathan Marshall authored committed
Showing with 49 additions and 49 deletions.
  1. +49 −49 xbmc/utils/FileUtils.cpp
View
98 xbmc/utils/FileUtils.cpp
@@ -145,58 +145,58 @@ unsigned int CFileUtils::LoadFile(const std::string &filename, void* &outputBuff
if (!file.Open(filename.c_str(), READ_TRUNCATED))
return 0;
- /*
- GetLength() will typically return values that fall into three cases:
- 1. The real filesize. This is the typical case.
- 2. Zero. This is the case for some http:// streams for example.
- 3. Some value smaller than the real filesize. This is the case for an expanding file.
-
- In order to handle all three cases, we read the file in chunks, relying on Read()
- returning 0 at EOF. To minimize (re)allocation of the buffer, the chunksize in
- cases 1 and 3 is set to one byte larger than the value returned by GetLength().
- The chunksize in case 2 is set to the larger of 64k and GetChunkSize().
-
- We fill the buffer entirely before reallocation. Thus, reallocation never occurs in case 1
- as the buffer is larger than the file, so we hit EOF before we hit the end of buffer.
-
- To minimize reallocation, we double the chunksize each time up to a maxchunksize of 2MB.
- */
- unsigned int filesize = (unsigned int)file.GetLength();
- unsigned int chunksize = filesize ? (filesize + 1) : std::max(65536U, (unsigned int)file.GetChunkSize());
- unsigned int maxchunksize = 2048*1024U; /* max 2MB chunksize */
- unsigned char *tempinputBuff = NULL;
-
- unsigned int total_read = 0, free_space = 0;
- while (true)
- {
- if (!free_space)
- { // (re)alloc
- inputBuffSize += chunksize;
- tempinputBuff = (unsigned char *)realloc(inputBuff, inputBuffSize);
- if (!tempinputBuff)
- {
- CLog::Log(LOGERROR, "%s unable to allocate buffer of size %u", __FUNCTION__, inputBuffSize);
- free(inputBuff);
- file.Close();
- return 0;
- }
- inputBuff = tempinputBuff;
- free_space = chunksize;
- chunksize = std::min(chunksize*2, maxchunksize);
+ /*
+ GetLength() will typically return values that fall into three cases:
+ 1. The real filesize. This is the typical case.
+ 2. Zero. This is the case for some http:// streams for example.
+ 3. Some value smaller than the real filesize. This is the case for an expanding file.
+
+ In order to handle all three cases, we read the file in chunks, relying on Read()
+ returning 0 at EOF. To minimize (re)allocation of the buffer, the chunksize in
+ cases 1 and 3 is set to one byte larger than the value returned by GetLength().
+ The chunksize in case 2 is set to the larger of 64k and GetChunkSize().
+
+ We fill the buffer entirely before reallocation. Thus, reallocation never occurs in case 1
+ as the buffer is larger than the file, so we hit EOF before we hit the end of buffer.
+
+ To minimize reallocation, we double the chunksize each time up to a maxchunksize of 2MB.
+ */
+ unsigned int filesize = (unsigned int)file.GetLength();
+ unsigned int chunksize = filesize ? (filesize + 1) : std::max(65536U, (unsigned int)file.GetChunkSize());
+ unsigned int maxchunksize = 2048*1024U; /* max 2MB chunksize */
+ unsigned char *tempinputBuff = NULL;
+
+ unsigned int total_read = 0, free_space = 0;
+ while (true)
+ {
+ if (!free_space)
+ { // (re)alloc
+ inputBuffSize += chunksize;
+ tempinputBuff = (unsigned char *)realloc(inputBuff, inputBuffSize);
+ if (!tempinputBuff)
+ {
+ CLog::Log(LOGERROR, "%s unable to allocate buffer of size %u", __FUNCTION__, inputBuffSize);
+ free(inputBuff);
+ file.Close();
+ return 0;
}
- unsigned int read = file.Read(inputBuff + total_read, free_space);
- free_space -= read;
- total_read += read;
- if (!read)
- break;
+ inputBuff = tempinputBuff;
+ free_space = chunksize;
+ chunksize = std::min(chunksize*2, maxchunksize);
}
- inputBuffSize = total_read;
- file.Close();
+ unsigned int read = file.Read(inputBuff + total_read, free_space);
+ free_space -= read;
+ total_read += read;
+ if (!read)
+ break;
+ }
+ inputBuffSize = total_read;
+ file.Close();
- if (inputBuffSize == 0)
- return 0;
+ if (inputBuffSize == 0)
+ return 0;
- outputBuffer = (void *) inputBuff;
- return inputBuffSize;
+ outputBuffer = (void *) inputBuff;
+ return inputBuffSize;
}
Please sign in to comment.
Something went wrong with that request. Please try again.