Style and include cleanups.

This commit is contained in:
Ian Gulliver
2016-02-17 16:40:09 -08:00
parent 8e2e7b2562
commit ae5b4c1ce4
19 changed files with 213 additions and 245 deletions

View File

@@ -10,7 +10,6 @@
int epoll_fd;
void peer_init() {
epoll_fd = epoll_create1(0);
assert(epoll_fd >= 0);
@@ -123,15 +122,15 @@ void hex_init() {
}
}
void hex_to_bin(uint8_t *out, char *in, size_t bytes) {
uint8_t *in2 = (uint8_t *) in;
void hex_to_bin(uint8_t *out, const char *in, size_t bytes) {
const uint8_t *in2 = (uint8_t *) in;
for (size_t i = 0, j = 0; i < bytes; i++, j += 2) {
out[i] = (hex_table[in2[j]] << 4) | hex_table[in2[j + 1]];
}
}
uint64_t hex_to_int(char *in, size_t bytes) {
uint8_t *in2 = (uint8_t *) in;
uint64_t hex_to_int(const char *in, size_t bytes) {
const uint8_t *in2 = (uint8_t *) in;
uint64_t ret = 0;
bytes *= 2;
for (size_t i = 0; i < bytes; i++) {
@@ -141,7 +140,7 @@ uint64_t hex_to_int(char *in, size_t bytes) {
return ret;
}
void hex_from_bin(char *out, uint8_t *in, size_t bytes) {
void hex_from_bin(char *out, const uint8_t *in, size_t bytes) {
for (size_t i = 0, j = 0; i < bytes; i++, j += 2) {
out[j] = hex_char_table[in[i] >> 4];
out[j + 1] = hex_char_table[in[i] & 0xf];
@@ -154,11 +153,3 @@ void uuid_gen(char *out) {
uuid_generate(uuid);
uuid_unparse(uuid, out);
}
char server_id[UUID_LEN];
void server_init() {
uuid_gen(server_id);
fprintf(stderr, "S %s: Server start\n", server_id);
}