generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-25 14:34:05 +02:00
Code Issues Projects Releases Wiki Activity

Replaced NULL with nullptr.

Browse Source
This commit is contained in:
Takatoshi Kondo 2013-09-11 11:21:11 +09:00
parent f7692691ca
commit fe82444db1
12 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/msgpack/type/define.hpp.erb
View File

@ -85,7 +85,7 @@ struct define<> {
void msgpack_object(msgpack::object* o, msgpack::zone* z) const void msgpack_object(msgpack::object* o, msgpack::zone* z) const
{ {
o->type = type::ARRAY; o->type = type::ARRAY;
o->via.array.ptr = NULL; o->via.array.ptr = nullptr;
o->via.array.size = 0; o->via.array.size = 0;
} }
}; };

2
src/msgpack/type/deque.hpp
View File

@ -54,7 +54,7 @@ inline void operator<< (object::with_zone& o, const std::deque<T>& v)
{ {
o.type = type::ARRAY; o.type = type::ARRAY;
if(v.empty()) { if(v.empty()) {
o.via.array.ptr = NULL; o.via.array.ptr = nullptr;
o.via.array.size = 0; o.via.array.size = 0;
} else { } else {
object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size())); object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size()));

2
src/msgpack/type/list.hpp
View File

@ -54,7 +54,7 @@ inline void operator<< (object::with_zone& o, const std::list<T>& v)
{ {
o.type = type::ARRAY; o.type = type::ARRAY;
if(v.empty()) { if(v.empty()) {
o.via.array.ptr = NULL; o.via.array.ptr = nullptr;
o.via.array.size = 0; o.via.array.size = 0;
} else { } else {
object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size())); object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size()));

6
src/msgpack/type/map.hpp
View File

@ -75,7 +75,7 @@ inline void operator<< (object::with_zone& o, const type::assoc_vector<K,V>& v)
{ {
o.type = type::MAP; o.type = type::MAP;
if(v.empty()) { if(v.empty()) {
o.via.map.ptr = NULL; o.via.map.ptr = nullptr;
o.via.map.size = 0; o.via.map.size = 0;
} else { } else {
object_kv* p = static_cast<object_kv*>(o.zone->malloc(sizeof(object_kv)*v.size())); object_kv* p = static_cast<object_kv*>(o.zone->malloc(sizeof(object_kv)*v.size()));
@ -131,7 +131,7 @@ inline void operator<< (object::with_zone& o, const std::map<K,V>& v)
{ {
o.type = type::MAP; o.type = type::MAP;
if(v.empty()) { if(v.empty()) {
o.via.map.ptr = NULL; o.via.map.ptr = nullptr;
o.via.map.size = 0; o.via.map.size = 0;
} else { } else {
object_kv* p = static_cast<object_kv*>(o.zone->malloc(sizeof(object_kv)*v.size())); object_kv* p = static_cast<object_kv*>(o.zone->malloc(sizeof(object_kv)*v.size()));
@ -181,7 +181,7 @@ inline void operator<< (object::with_zone& o, const std::multimap<K,V>& v)
{ {
o.type = type::MAP; o.type = type::MAP;
if(v.empty()) { if(v.empty()) {
o.via.map.ptr = NULL; o.via.map.ptr = nullptr;
o.via.map.size = 0; o.via.map.size = 0;
} else { } else {
object_kv* p = static_cast<object_kv*>(o.zone->malloc(sizeof(object_kv)*v.size())); object_kv* p = static_cast<object_kv*>(o.zone->malloc(sizeof(object_kv)*v.size()));

2
src/msgpack/type/raw.hpp
View File

@ -27,7 +27,7 @@ namespace msgpack {
namespace type { namespace type {
struct raw_ref { struct raw_ref {
raw_ref() : size(0), ptr(NULL) {} raw_ref() : size(0), ptr(nullptr) {}
raw_ref(const char* p, uint32_t s) : size(s), ptr(p) {} raw_ref(const char* p, uint32_t s) : size(s), ptr(p) {}
uint32_t size; uint32_t size;

4
src/msgpack/type/set.hpp
View File

@ -53,7 +53,7 @@ inline void operator<< (object::with_zone& o, const std::set<T>& v)
{ {
o.type = type::ARRAY; o.type = type::ARRAY;
if(v.empty()) { if(v.empty()) {
o.via.array.ptr = NULL; o.via.array.ptr = nullptr;
o.via.array.size = 0; o.via.array.size = 0;
} else { } else {
object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size())); object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size()));
@ -99,7 +99,7 @@ inline void operator<< (object::with_zone& o, const std::multiset<T>& v)
{ {
o.type = type::ARRAY; o.type = type::ARRAY;
if(v.empty()) { if(v.empty()) {
o.via.array.ptr = NULL; o.via.array.ptr = nullptr;
o.via.array.size = 0; o.via.array.size = 0;
} else { } else {
object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size())); object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size()));

4
src/msgpack/type/tr1/unordered_map.hpp
View File

@ -74,7 +74,7 @@ inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_m
{ {
o.type = type::MAP; o.type = type::MAP;
if(v.empty()) { if(v.empty()) {
o.via.map.ptr = NULL; o.via.map.ptr = nullptr;
o.via.map.size = 0; o.via.map.size = 0;
} else { } else {
object_kv* p = static_cast<object_kv*>(o.zone->malloc(sizeof(object_kv)*v.size())); object_kv* p = static_cast<object_kv*>(o.zone->malloc(sizeof(object_kv)*v.size()));
@ -124,7 +124,7 @@ inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_m
{ {
o.type = type::MAP; o.type = type::MAP;
if(v.empty()) { if(v.empty()) {
o.via.map.ptr = NULL; o.via.map.ptr = nullptr;
o.via.map.size = 0; o.via.map.size = 0;
} else { } else {
object_kv* p = static_cast<object_kv*>(o.zone->malloc(sizeof(object_kv)*v.size())); object_kv* p = static_cast<object_kv*>(o.zone->malloc(sizeof(object_kv)*v.size()));

4
src/msgpack/type/tr1/unordered_set.hpp
View File

@ -71,7 +71,7 @@ inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_s
{ {
o.type = type::ARRAY; o.type = type::ARRAY;
if(v.empty()) { if(v.empty()) {
o.via.array.ptr = NULL; o.via.array.ptr = nullptr;
o.via.array.size = 0; o.via.array.size = 0;
} else { } else {
object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size())); object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size()));
@ -117,7 +117,7 @@ inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_m
{ {
o.type = type::ARRAY; o.type = type::ARRAY;
if(v.empty()) { if(v.empty()) {
o.via.array.ptr = NULL; o.via.array.ptr = nullptr;
o.via.array.size = 0; o.via.array.size = 0;
} else { } else {
object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size())); object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size()));

2
src/msgpack/type/tuple.hpp.erb
View File

@ -175,7 +175,7 @@ inline void operator<< (
object::with_zone& o, object::with_zone& o,
const type::tuple<>& v) { const type::tuple<>& v) {
o.type = type::ARRAY; o.type = type::ARRAY;
o.via.array.ptr = NULL; o.via.array.ptr = nullptr;
o.via.array.size = 0; o.via.array.size = 0;
} }
<%0.upto(GENERATION_LIMIT) {|i|%> <%0.upto(GENERATION_LIMIT) {|i|%>

2
src/msgpack/type/vector.hpp
View File

@ -58,7 +58,7 @@ inline void operator<< (object::with_zone& o, const std::vector<T>& v)
{ {
o.type = type::ARRAY; o.type = type::ARRAY;
if(v.empty()) { if(v.empty()) {
o.via.array.ptr = NULL; o.via.array.ptr = nullptr;
o.via.array.size = 0; o.via.array.size = 0;
} else { } else {
object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size())); object* p = static_cast<object*>(o.zone->malloc(sizeof(object)*v.size()));

16
src/msgpack/unpack.hpp
View File

@ -110,7 +110,7 @@ struct unpack_array {
o.type = type::ARRAY; o.type = type::ARRAY;
o.via.array.size = 0; o.via.array.size = 0;
o.via.array.ptr = (object*)u.z().malloc(n*sizeof(object)); o.via.array.ptr = (object*)u.z().malloc(n*sizeof(object));
if(o.via.array.ptr == NULL) { return false; } if(o.via.array.ptr == nullptr) { return false; }
return true; return true;
} }
}; };
@ -123,7 +123,7 @@ struct unpack_map {
o.type = type::MAP; o.type = type::MAP;
o.via.map.size = 0; o.via.map.size = 0;
o.via.map.ptr = (object_kv*)u.z().malloc(n*sizeof(object_kv)); o.via.map.ptr = (object_kv*)u.z().malloc(n*sizeof(object_kv));
if(o.via.map.ptr == NULL) { return false; } if(o.via.map.ptr == nullptr) { return false; }
return true; return true;
} }
}; };
@ -802,9 +802,9 @@ private:
inline void unpack(unpacked& result, inline void unpack(unpacked& result,
const char* data, size_t len, size_t* offset = NULL); const char* data, size_t len, size_t* offset = nullptr);
inline void unpack(unpacked* result, inline void unpack(unpacked* result,
const char* data, size_t len, size_t* offset = NULL); const char* data, size_t len, size_t* offset = nullptr);
// obsolete // obsolete
typedef enum { typedef enum {
@ -822,8 +822,8 @@ static unpack_return unpack(const char* data, size_t len, size_t* off,
// obsolete // obsolete
static object unpack(const char* data, size_t len, zone& z, size_t* off = NULL); static object unpack(const char* data, size_t len, zone& z, size_t* off = nullptr);
static object unpack(const char* data, size_t len, zone* z, size_t* off = NULL); static object unpack(const char* data, size_t len, zone* z, size_t* off = nullptr);
inline unpacker::unpacker(size_t initial_buffer_size) inline unpacker::unpacker(size_t initial_buffer_size)
@ -1081,7 +1081,7 @@ unpack_imp(const char* data, size_t len, size_t* off,
zone& result_zone, object& result) zone& result_zone, object& result)
{ {
size_t noff = 0; size_t noff = 0;
if(off != NULL) { noff = *off; } if(off != nullptr) { noff = *off; }
if(len <= noff) { if(len <= noff) {
// FIXME // FIXME
@ -1099,7 +1099,7 @@ unpack_imp(const char* data, size_t len, size_t* off,
return UNPACK_PARSE_ERROR; return UNPACK_PARSE_ERROR;
} }
if(off != NULL) { *off = noff; } if(off != nullptr) { *off = noff; }
if(e == 0) { if(e == 0) {
return UNPACK_CONTINUE; return UNPACK_CONTINUE;

6
src/msgpack/zbuffer.hpp
View File

@ -122,8 +122,8 @@ public:
char* release_buffer() char* release_buffer()
{ {
char* tmp = data_; char* tmp = data_;
data_ = NULL; data_ = nullptr;
stream_.next_out = NULL; stream_.next_out = nullptr;
stream_.avail_out = 0; stream_.avail_out = 0;
return tmp; return tmp;
} }
@ -136,7 +136,7 @@ private:
size_t nsize = (csize == 0) ? init_size_ : csize * 2; size_t nsize = (csize == 0) ? init_size_ : csize * 2;
char* tmp = static_cast<char*>(::realloc(data_, nsize)); char* tmp = static_cast<char*>(::realloc(data_, nsize));
if(tmp == NULL) { if(tmp == nullptr) {
return false; return false;
} }