Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Runs clang-format on ntcore (#150)

Browse Source 
Also updates .clang-format to match allwpilib

WPIUtil was skipped
This commit is contained in:
Thad House
2016-11-03 21:03:45 -07:00
committed by Peter Johnson
parent cf0ec7b9a9
commit 05ca76ea99
32 changed files with 712 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Value.cpp
View File

@@ -59,7 +59,7 @@ std::shared_ptr<Value> Value::MakeStringArray(
// point NT_Value to the contents in the vector.
val->m_val.data.arr_string.arr = new NT_String[value.size()];
val->m_val.data.arr_string.size = val->m_string_array.size();
for (std::size_t i=0; i<value.size(); ++i) {
for (std::size_t i = 0; i < value.size(); ++i) {
val->m_val.data.arr_string.arr[i].str = const_cast<char*>(value[i].c_str());
val->m_val.data.arr_string.arr[i].len = value[i].size();
}
@@ -74,7 +74,7 @@ std::shared_ptr<Value> Value::MakeStringArray(
// point NT_Value to the contents in the vector.
val->m_val.data.arr_string.arr = new NT_String[val->m_string_array.size()];
val->m_val.data.arr_string.size = val->m_string_array.size();
for (std::size_t i=0; i<val->m_string_array.size(); ++i) {
for (std::size_t i = 0; i < val->m_string_array.size(); ++i) {
val->m_val.data.arr_string.arr[i].str =
const_cast<char*>(val->m_string_array[i].c_str());
val->m_val.data.arr_string.arr[i].len = val->m_string_array[i].size();
@@ -121,7 +121,7 @@ void nt::ConvertToC(const Value& in, NT_Value* out) {
case NT_STRING_ARRAY: {
auto v = in.GetStringArray();
out->data.arr_string.arr =
static_cast<NT_String*>(std::malloc(v.size()*sizeof(NT_String)));
static_cast<NT_String*>(std::malloc(v.size() * sizeof(NT_String)));
for (size_t i = 0; i < v.size(); ++i)
ConvertToC(v[i], &out->data.arr_string.arr[i]);
out->data.arr_string.size = v.size();
@@ -136,7 +136,7 @@ void nt::ConvertToC(const Value& in, NT_Value* out) {
void nt::ConvertToC(llvm::StringRef in, NT_String* out) {
out->len = in.size();
out->str = static_cast<char*>(std::malloc(in.size()+1));
out->str = static_cast<char*>(std::malloc(in.size() + 1));
std::memcpy(out->str, in.data(), in.size());
out->str[in.size()] = '\0';
}
@@ -164,7 +164,7 @@ std::shared_ptr<Value> nt::ConvertFromC(const NT_Value& value) {
case NT_STRING_ARRAY: {
std::vector<std::string> v;
v.reserve(value.data.arr_string.size);
for (size_t i=0; i<value.data.arr_string.size; ++i)
for (size_t i = 0; i < value.data.arr_string.size; ++i)
v.push_back(ConvertFromC(value.data.arr_string.arr[i]));
return Value::MakeStringArray(std::move(v));
}