chore: format code

Author: postables

.travis.yml

@@ -1,4 +1,4 @@
-dist: xenial
+dist: trusty
 sudo: required
 language:
   - cpp
@@ -10,8 +10,8 @@ addons:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - gcc-10
-      - g++-10
+      - gcc-9
+      - g++-9
       - cmake
 
 before_install:
@@ -22,11 +22,11 @@ before_install:
 
 script:
   # Link gcc-9 and g++-9 to their standard commands
-  - sudo ln -s /usr/bin/gcc-10 /usr/local/bin/gcc
-  - sudo ln -s /usr/bin/g++-10 /usr/local/bin/g++
+  - sudo ln -s /usr/bin/gcc-9 /usr/local/bin/gcc
+  - sudo ln -s /usr/bin/g++-9 /usr/local/bin/g++
   # Export CC and CXX to tell cmake which compiler to use
-  - export CC=/usr/bin/gcc-10
-  - export CXX=/usr/bin/g++-10
+  - export CC=/usr/bin/gcc-9
+  - export CXX=/usr/bin/g++-9
   # Check versions of gcc, g++ and cmake
   - gcc -v && g++ -v && cmake --version
   # build project in release mode

CMakeLists.txt

@@ -4,7 +4,7 @@
 
 cmake_minimum_required(VERSION 3.0)
 project(libcp2p LANGUAGES C)
-    set(CMAKE_C_COMPILER /usr/bin/gcc-10)
+set(CMAKE_C_COMPILER /usr/bin/gcc)
 
 
 # handle debug build type

include/crypto/aes.h

@@ -1,6 +1,6 @@
 /*! @file aes.h
-  * @brief proivides aes encryption/decryption functions
-*/
+ * @brief proivides aes encryption/decryption functions
+ */
 
 #pragma once
 

include/crypto/key.h

@@ -55,5 +55,4 @@ int libp2p_crypto_private_key_protobuf_encode(const struct PrivateKey *in,
  * @param peer_id the results, in a null-terminated string
  * @returns true(1) on success, otherwise false(0)
  */
-int libp2p_crypto_public_key_to_peer_id(struct PublicKey *public_key,
-                                        char *peer_id);
+int libp2p_crypto_public_key_to_peer_id(struct PublicKey *public_key, char *peer_id);

include/crypto/peerutils.h

@@ -1,6 +1,6 @@
 /*! @file peerutils.h
-  * @brief provides utilities for managing peer identifiers
-*/
+ * @brief provides utilities for managing peer identifiers
+ */
 
 #pragma once
 

include/crypto/sha1.h

@@ -12,8 +12,8 @@
 // limitations under the License.
 
 /*! @file sha1.h
-  * @brief provides sha1 hashing support
-*/
+ * @brief provides sha1 hashing support
+ */
 
 #pragma once
 

include/crypto/sha256.h

@@ -1,6 +1,6 @@
 /*! @file sha256.h
-  * @brief provides sha256 hashing support
-*/
+ * @brief provides sha256 hashing support
+ */
 
 #pragma once
 

include/crypto/sha512.h

@@ -1,6 +1,6 @@
 /*! @file sha512.h
-  * @brief provides sha512 hashing support
-*/
+ * @brief provides sha512 hashing support
+ */
 
 #pragma once
 

include/encoding/base16.h

@@ -1,6 +1,6 @@
 /*! @file base16.h
-  * @brief provides base 16 encoding/decoding functions
-*/
+ * @brief provides base 16 encoding/decoding functions
+ */
 #include <stddef.h>
 
 /**

include/encoding/base32.h

@@ -1,6 +1,6 @@
 /*! @file base32.h
-  * @brief provides base 32 encoding/decoding functions
-*/
+ * @brief provides base 32 encoding/decoding functions
+ */
 
 #pragma once
 

include/encoding/base64.h

@@ -1,6 +1,6 @@
 /*! @file base64.h
-  * @brief provides base 64 encoding/decoding functions
-*/
+ * @brief provides base 64 encoding/decoding functions
+ */
 
 #pragma once
 

include/multiaddr/multiaddr.h

@@ -30,9 +30,9 @@
  */
 
 /*! @struct multi_address
-  * @typedef multi_addr_t
-  * @brief a structure composing a multiaddress
-*/
+ * @typedef multi_addr_t
+ * @brief a structure composing a multiaddress
+ */
 typedef struct multi_address {
     // A multi_address represented as a string
     char *string;
@@ -48,7 +48,7 @@ int strpos(char *haystack, char *needle);
 
 struct multi_address *
 multi_address_new_from_bytes(const uint8_t *byteaddress,
-                            int size); // Construct new address from bytes
+                             int size); // Construct new address from bytes
 
 struct multi_address *multi_address_new_from_string(
     const char *straddress); // Construct new address from string
@@ -101,7 +101,8 @@ char *multi_address_get_peer_id(const struct multi_address *in);
  * @param b side B
  * @returns <0 if B > A; >0 if A > B; 0 if A == B
  */
-int multi_address_compare(const struct multi_address *a, const struct multi_address *b);
+int multi_address_compare(const struct multi_address *a,
+                          const struct multi_address *b);
 
 /**
  * @brief Check to see how these two addresses compare, ignoring IP address, only
@@ -111,4 +112,4 @@ int multi_address_compare(const struct multi_address *a, const struct multi_addr
  * @returns <0 if B > A; >0 if A > B; 0 if A == B
  */
 int multi_address_compare_id(const struct multi_address *a,
-                            const struct multi_address *b);
+                             const struct multi_address *b);

include/multiaddr/protocols.h

@@ -1,6 +1,6 @@
 /*! @file protocols.h
-  * @brief functions for managing multiaddr protocols
-*/
+ * @brief functions for managing multiaddr protocols
+ */
 
 #pragma once
 

include/multiaddr/protoutils.h

@@ -1,6 +1,6 @@
 /*! @file protoutils.h
-  * @brief utility functions for working with multiaddrs and protocols
-*/
+ * @brief utility functions for working with multiaddrs and protocols
+ */
 #include <stddef.h>
 #include <stdint.h>
 
@@ -60,8 +60,7 @@ int bytes_to_string(char *results, const uint8_t *bytes, int bytes_size);
  * @returns Failure: 1
  */
 int address_string_to_bytes(struct Protocol *protocol, const char *incoming,
-                              size_t incoming_size, char *results,
-                              int *results_size);
+                            size_t incoming_size, char *results, int *results_size);
 
 int string_to_bytes(uint8_t **finalbytes, size_t *realbbsize, const char *strx,
                     size_t strsize);

include/multibase/multibase.h

@@ -1,6 +1,6 @@
 /*! @file multibase.h
-  * @brief functions for managing multibase identifiers
-*/
+ * @brief functions for managing multibase identifiers
+ */
 
 #include <stdio.h>
 
@@ -30,7 +30,8 @@ int multibase_encode(const char base, const unsigned char *incoming,
                      size_t results_max_length, size_t *results_length);
 
 /***
- * @brief Calculates the size of the buffer neccessary to encode the incoming byte array
+ * @brief Calculates the size of the buffer neccessary to encode the incoming byte
+ * array
  * @param base the encoding to use
  * @param incoming the incoming array of bytes
  * @param incoming_length the length of the array in bytes
@@ -53,7 +54,8 @@ int multibase_decode(const unsigned char *incoming, size_t incoming_length,
                      size_t *results_length);
 
 /***
- * @brief Calculates the size of the buffer neccessary to decode the incoming byte array
+ * @brief Calculates the size of the buffer neccessary to decode the incoming byte
+ * array
  * @param base the encoding to use
  * @param incoming the incoming array of bytes
  * @param incoming_length the length of the array in bytes

include/multicodec/codecs.h

@@ -14,7 +14,8 @@
  * @author Bonedaddy
  * @brief macro definitions of all supported codecs
  * @details for actual multicodec functions see multicodec.h
- * @note the 0xCert-imprint-256 codec is not supported as it is an invalid variable name
+ * @note the 0xCert-imprint-256 codec is not supported as it is an invalid variable
+ * name
  */
 
 #pragma once

include/multicodec/multicodec.h

@@ -59,7 +59,8 @@ multicodec_encoded_t *multicodec_encode(char *codec, char *inData,
 
 /**
  * @brief Decode a multicodec encoded data array
- * @param encoded an instance of multicodec_encoded_t holding the encoded data and codec used
+ * @param encoded an instance of multicodec_encoded_t holding the encoded data and
+ * codec used
  * @param outData the array to put the results in
  * @param maxOutDataLength the maximum size of the data
  * @returns an error code or 0 if all is well

include/multihash/errors.h

@@ -1,6 +1,6 @@
 /*! @file errors.h
-  * @brief helpers for working with multihash errors
-*/
+ * @brief helpers for working with multihash errors
+ */
 
 #pragma once
 

include/multihash/generic.h

@@ -1,6 +1,6 @@
 /*! @file generic.h
-  * @brief generic definitions for multihashes
-*/
+ * @brief generic definitions for multihashes
+ */
 
 #pragma once
 

include/multihash/hashes.h

@@ -1,6 +1,6 @@
 /*! @file hashes.h
-  * @brief multihash definitions
-*/
+ * @brief multihash definitions
+ */
 #pragma once
 
 #include "errors.h"

include/multihash/multihash.h

@@ -1,6 +1,6 @@
 /*! @file multihash.h
-  * @brief functions for working with multihashes
-*/
+ * @brief functions for working with multihashes
+ */
 #pragma once
 
 #include <stddef.h>

src/crypto/ecdsa.c

@@ -91,7 +91,7 @@ unsigned char *libp2p_crypto_ecdsa_keypair_peerid(ecdsa_private_key_t *pk) {
     if (peer_id == NULL) {
         free(public_key);
         free(public_key_hash);
-        return NULL;        
+        return NULL;
     }
     strcpy((char *)peer_id, (char *)temp_peer_id);
 

src/multiaddr/multiaddr.c

@@ -21,7 +21,6 @@ int strpos(char *haystack, char *needle) {
  * Construct a new multi_address struct
  * @returns an empty multi_address struct
  */
-#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak" // this seems to be a false positive
 struct multi_address *multi_address_new() {
     struct multi_address *out =
         (struct multi_address *)malloc(sizeof(struct multi_address));
@@ -43,7 +42,7 @@ struct multi_address *multi_address_new() {
  */
 struct multi_address *
 multi_address_new_from_bytes(const uint8_t *byteaddress,
-                            int size) // Construct new address from bytes
+                             int size) // Construct new address from bytes
 {
     struct multi_address *out = multi_address_new();
     if (out != NULL) {
@@ -344,7 +343,7 @@ int multi_address_decapsulate(struct multi_address *result, char *srci) {
  * @returns <0 if B > A; >0 if A > B; 0 if A == B
  */
 int multi_address_compare(const struct multi_address *a,
-                         const struct multi_address *b) {
+                          const struct multi_address *b) {
     if (a == NULL && b == NULL)
         return 0;
     if (a == NULL && b != NULL)
@@ -370,7 +369,7 @@ int multi_address_compare(const struct multi_address *a,
  * @returns <0 if B > A; >0 if A > B; 0 if A == B
  */
 int multi_address_compare_id(const struct multi_address *a,
-                            const struct multi_address *b) {
+                             const struct multi_address *b) {
     char *a_id = multi_address_get_peer_id(a);
     char *b_id = multi_address_get_peer_id(b);
     if (a_id == NULL && b_id == NULL)

src/multiaddr/protoutils.c

@@ -379,8 +379,7 @@ int bytes_to_string(char *buffer, const uint8_t *in_bytes, int in_bytes_size) {
  * @returns the results array
  */
 int address_string_to_bytes(struct Protocol *protocol, const char *incoming,
-                              size_t incoming_size, char *results,
-                              int *results_size) {
+                            size_t incoming_size, char *results, int *results_size) {
     static char astb__stringy[800] = "\0";
     memset(astb__stringy, 0, 800);
 
@@ -533,7 +532,7 @@ int address_string_to_bytes(struct Protocol *protocol, const char *incoming,
             strcpy(prefixed, Num_To_HexVar_32(ilen));
             *results_size = ilen + 3;
             memset(results, 0, *results_size);
-            strcat(results, prefixed); // 2 bytes
+            strcat(results, prefixed);     // 2 bytes
             strcat(results, addr_encoded); // ilen bytes + null terminator
             return 0;
         }
@@ -622,7 +621,8 @@ int string_to_bytes(uint8_t **finalbytes, size_t *realbbsize, const char *strx,
         } else // This is the address
         {
             memset(s_to_b, 0, 800);
-            int rc = address_string_to_bytes(protx, wp, strlen(wp), s_to_b, &s_to_b_size);
+            int rc =
+                address_string_to_bytes(protx, wp, strlen(wp), s_to_b, &s_to_b_size);
             if (rc == 1) {
                 malf = 1;
             } else {

src/network/socket_server.c

@@ -425,7 +425,6 @@ void free_socket_server_config(socket_server_config_t *config) {
  * socket_server_config_t
  * @return Failure: NULL pointer
  */
-#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
 socket_server_config_t *new_socket_server_config(int num_addrs) {
     socket_server_config_t *config =
         calloc(sizeof(socket_server_config_t), sizeof(socket_server_config_t));

src/utils/thread_pool.c

@@ -1,6 +1,3 @@
-#pragma GCC diagnostic ignored "-Wanalyzer-double-free"
-#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
-#pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
 /*! ********************************
  * Author:       Johan Hanssen Seferidis
  * License:	     MIT