Skip to content

Commit

Permalink
Fix whitespace errors
Browse files Browse the repository at this point in the history
  • Loading branch information
rescrv committed Feb 8, 2013
1 parent b3cfa9d commit 6827892
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion client/coordinator_link.cc
Expand Up @@ -75,7 +75,7 @@ coordinator_link :: wait_for_config(hyperclient_returncode* status)
while (version >= m_config.version())
{
#ifdef _MSC_VER
//XXX: There can be at most 64 fds in the set
//XXX: There can be at most 64 fds in the set
pollfd pfd[64];
int fd_count = m_repl.poll_fd()->fd_count;

Expand Down
2 changes: 1 addition & 1 deletion client/pending_sorted_search.cc
Expand Up @@ -150,7 +150,7 @@ hyperclient :: pending_sorted_search :: handle_response(hyperclient* cl,

if (m_state->m_results.empty())
{
#ifdef _MSC_VER
#ifdef _MSC_VER
cl->m_complete_failed.push(std::shared_ptr<complete>(new complete(client_visible_id(), status_ptr(), HYPERCLIENT_SEARCHDONE, 0)));
#else
cl->m_complete_failed.push(complete(client_visible_id(), status_ptr(), HYPERCLIENT_SEARCHDONE, 0));
Expand Down
2 changes: 1 addition & 1 deletion common/range_searches.cc
Expand Up @@ -93,7 +93,7 @@ range_search(const attribute_check* ptr,
switch (ptr->predicate)
{
case HYPERPREDICATE_EQUALS:
if ((lower && compare_as_type(ptr->value, lower->value, ptr->datatype) < 0) ||
if ((lower && compare_as_type(ptr->value, lower->value, ptr->datatype) < 0) ||
(upper && compare_as_type(ptr->value, upper->value, ptr->datatype) > 0))
{
return;
Expand Down
2 changes: 1 addition & 1 deletion daemon/replication_manager.cc
Expand Up @@ -428,7 +428,7 @@ replication_manager :: chain_subspace(const virtual_server_id& from,
m_daemon->m_config.lookup_region(subspace_next, new_pend->old_hashes, &new_pend->next_region);
}

if (!(new_pend->this_old_region == m_daemon->m_config.get_region_id(from) &&
if (!(new_pend->this_old_region == m_daemon->m_config.get_region_id(from) &&
m_daemon->m_config.tail_of_region(new_pend->this_old_region) == from) &&
!(new_pend->this_new_region == m_daemon->m_config.get_region_id(from) &&
m_daemon->m_config.next_in_region(from) == to))
Expand Down
2 changes: 1 addition & 1 deletion datatypes/float.cc
Expand Up @@ -52,7 +52,7 @@ apply_float(const e::slice& old_value,
if (old_value.size())
{
e::unpackdoublele(old_value.data(), &number);
}
}

for (size_t i = 0; i < num_funcs; ++i)
{
Expand Down
12 changes: 6 additions & 6 deletions util/atomicfile.h
Expand Up @@ -54,7 +54,7 @@ class atomicfile
static bool rewrite(const char* dir, const char* file, const char* contents);
};

inline bool
inline bool
atomicfile::rewrite(const char* dir, const char* file, const char* contents)
{
// Using C file I/O as C++ flush and sync are not portable.
Expand All @@ -66,22 +66,22 @@ atomicfile::rewrite(const char* dir, const char* file, const char* contents)
{
return false;
}

FILE *f = fdopen(fd.get(), "w");
if (!f)
{
::close(fd.get());
unlink(tmp_name.get());
return false;
}

if (EOF == fputs(contents, f))
{
fclose(f);
unlink(tmp_name.get());
return false;
}

// Make sure the file is on the disk.
if (fflush(f))
{
Expand All @@ -96,13 +96,13 @@ atomicfile::rewrite(const char* dir, const char* file, const char* contents)
unlink(tmp_name.get());
return false;
}

if (fclose(f))
{
unlink(tmp_name.get());
return false;
}

// Rename the temp file into target.
po6::pathname file_name = po6::join(dir, file);
if (rename(tmp_name.get(), file_name.get()))
Expand Down
14 changes: 7 additions & 7 deletions windows/hyperclientclr.h
Expand Up @@ -21,7 +21,7 @@ using namespace System::Collections::Generic;
namespace
HyperDex
{
public enum class HyperClientReturnCode
public enum class HyperClientReturnCode
{
HYPERCLIENT_SUCCESS = 8448,
HYPERCLIENT_NOTFOUND = 8449,
Expand Down Expand Up @@ -79,7 +79,7 @@ HyperDex
Dictionary<String ^, Object ^> ^get(String ^space, String ^key);

#define HYPERCLIENT_CLRDEC(OPNAME) \
bool OPNAME(String ^space, String ^key, Dictionary<String ^, Object ^> ^ attrs);
bool OPNAME(String ^space, String ^key, Dictionary<String ^, Object ^> ^ attrs);

HYPERCLIENT_CLRDEC(put)
HYPERCLIENT_CLRDEC(put_if_not_exist)
Expand All @@ -101,7 +101,7 @@ HyperDex
HYPERCLIENT_CLRDEC(set_union)

#define HYPERCLIENT_MAP_CLRDEC(OPNAME) \
bool map_ ## OPNAME(String ^space, String ^key, Dictionary<String ^, Dictionary<Object^, Object ^>^ > ^ attrs);
bool map_ ## OPNAME(String ^space, String ^key, Dictionary<String ^, Dictionary<Object^, Object ^>^ > ^ attrs);

HYPERCLIENT_MAP_CLRDEC(add)
HYPERCLIENT_MAP_CLRDEC(remove)
Expand All @@ -116,15 +116,15 @@ HyperDex
HYPERCLIENT_MAP_CLRDEC(string_prepend)
HYPERCLIENT_MAP_CLRDEC(string_append)

List<Dictionary<String ^, Object^>^ >^
List<Dictionary<String ^, Object^>^ >^
search(String^ space, Dictionary<String ^, Object^>^ checks);

List<Dictionary<String ^, Object^>^ >^
sorted_search(String^ space, String ^sortby,
List<Dictionary<String ^, Object^>^ >^
sorted_search(String^ space, String ^sortby,
UInt64 limit, bool maximize, Dictionary<String ^, Object^>^ checks);


UInt64
UInt64
count(String^ space, Dictionary<String ^, Object^>^ checks);


Expand Down
4 changes: 2 additions & 2 deletions windows/ieee754.h
@@ -1,8 +1,8 @@
#ifndef _IEEE754_H

#define _IEEE754_H 1
#define __LITTLE_ENDIAN 1234
#define __BIG_ENDIAN 4321
#define __LITTLE_ENDIAN 1234
#define __BIG_ENDIAN 4321
#define __BYTE_ORDER __LITTLE_ENDIAN
#define __FLOAT_WORD_ORDER __LITTLE_ENDIAN
#include <float.h>
Expand Down
6 changes: 3 additions & 3 deletions windows/marshal.h
Expand Up @@ -26,7 +26,7 @@ namespace msclr {
template<>
ref class context_node<const char*, Double ^> : public context_node_base
{
private:
private:
const char* toPtr;
marshal_context context;

Expand All @@ -41,7 +41,7 @@ namespace msclr {
template<>
ref class context_node<const char*, Int64 ^> : public context_node_base
{
private:
private:
const char* toPtr;
marshal_context context;

Expand Down Expand Up @@ -95,4 +95,4 @@ namespace msclr {
!context_node();
};
}
}
}

0 comments on commit 6827892

Please sign in to comment.