mega_venik/sdcv
1
0
Fork 0
mirror of https://github.com/Dushistov/sdcv.git synced 2025-12-16 18:01:54 +00:00
Code Issues Projects Releases Wiki Activity

use nullptr and other c++11 features for mapfile.hpp

Browse Source
This commit is contained in:
Evgeniy Dushistov
2013-07-06 22:48:54 +00:00
parent 89ef5574f2
commit 4d027dccd4
1 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/lib/mapfile.hpp
View File

@@ -1,5 +1,4 @@
#ifndef _MAPFILE_HPP_ #pragma once
#define _MAPFILE_HPP_
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
@@ -17,27 +16,20 @@
class MapFile { class MapFile {
public: public:
MapFile(void) : MapFile() {}
data(NULL)
#ifdef HAVE_MMAP
, mmap_fd(-1)
#elif defined(_WIN32)
,hFile(0),
hFileMap(0)
#endif
{
}
~MapFile(); ~MapFile();
MapFile(const MapFile&) = delete;
MapFile& operator=(const MapFile&) = delete;
bool open(const char *file_name, unsigned long file_size); bool open(const char *file_name, unsigned long file_size);
inline gchar *begin(void) { return data; } gchar *begin() { return data; }
private: private:
char *data; char *data = nullptr;
unsigned long size; unsigned long size = 0ul;
#ifdef HAVE_MMAP #ifdef HAVE_MMAP
int mmap_fd; int mmap_fd = -1;
#elif defined(_WIN32) #elif defined(_WIN32)
HANDLE hFile; HANDLE hFile = 0;
HANDLE hFileMap; HANDLE hFileMap = 0;
#endif #endif
}; };
@@ -49,24 +41,24 @@ inline bool MapFile::open(const char *file_name, unsigned long file_size)
//g_print("Open file %s failed!\n",fullfilename); //g_print("Open file %s failed!\n",fullfilename);
return false; return false;
} }
data = (gchar *)mmap( NULL, file_size, PROT_READ, MAP_SHARED, mmap_fd, 0); data = (gchar *)mmap( nullptr, file_size, PROT_READ, MAP_SHARED, mmap_fd, 0);
if ((void *)data == (void *)(-1)) { if ((void *)data == (void *)(-1)) {
//g_print("mmap file %s failed!\n",idxfilename); //g_print("mmap file %s failed!\n",idxfilename);
data=NULL; data=nullptr;
return false; return false;
} }
#elif defined( _WIN32) #elif defined( _WIN32)
hFile = CreateFile(file_name, GENERIC_READ, 0, NULL, OPEN_ALWAYS, hFile = CreateFile(file_name, GENERIC_READ, 0, nullptr, OPEN_ALWAYS,
FILE_ATTRIBUTE_NORMAL, 0); FILE_ATTRIBUTE_NORMAL, 0);
hFileMap = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, hFileMap = CreateFileMapping(hFile, nullptr, PAGE_READONLY, 0,
file_size, NULL); file_size, nullptr);
data = (gchar *)MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, file_size); data = (gchar *)MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, file_size);
#else #else
gsize read_len; gsize read_len;
if (!g_file_get_contents(file_name, &data, &read_len, NULL)) if (!g_file_get_contents(file_name, &data, &read_len, nullptr))
return false; return false;
if (read_len!=file_size) if (read_len != file_size)
return false; return false;
#endif #endif
@@ -91,4 +83,3 @@ inline MapFile::~MapFile()
#endif #endif
} }
#endif//!_MAPFILE_HPP_