Clang-format: fix some header files and remove them from whitelist

diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index f44fb9332640ba892da3ca1b4d32ed37f6575912..9d123393f4fb8f7cc5c429665ba4f088300171d4 100644 (file)
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -68,15 +68,9 @@ public:
                *ratio = m_day_night_ratio;
        }
 
-       void setHotbarImage(const std::string &name)
-       {
-               hud_hotbar_image = name;
-       }
+       void setHotbarImage(const std::string &name) { hud_hotbar_image = name; }
 
-       std::string getHotbarImage() const
-       {
-               return hud_hotbar_image;
-       }
+       std::string getHotbarImage() const { return hud_hotbar_image; }
 
        void setHotbarSelectedImage(const std::string &name)
        {
@@ -89,7 +83,7 @@ public:
        }
 
        void setSky(const video::SColor &bgcolor, const std::string &type,
-                               const std::vector<std::string> &params)
+                       const std::vector<std::string> &params)
        {
                m_sky_bgcolor = bgcolor;
                m_sky_type = type;
@@ -97,7 +91,7 @@ public:
        }
 
        void getSky(video::SColor *bgcolor, std::string *type,
-                               std::vector<std::string> *params)
+                       std::vector<std::string> *params)
        {
                *bgcolor = m_sky_bgcolor;
                *type = m_sky_type;
@@ -130,6 +124,7 @@ public:
        void setDirty(bool dirty) { m_dirty = true; }
 
        u16 protocol_version;
+
 private:
        /*
                serialize() writes a bunch of text that can contain

diff --git a/src/script/lua_api/l_mapgen.h b/src/script/lua_api/l_mapgen.h
index bb94575c72feef5302d74a36beabe30bdfa1a2df..a26c8b950a482cadfb52f6a8b02f74b936f60954 100644 (file)
--- a/src/script/lua_api/l_mapgen.h
+++ b/src/script/lua_api/l_mapgen.h
@@ -22,7 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "lua_api/l_base.h"
 
-class ModApiMapgen : public ModApiBase {
+class ModApiMapgen : public ModApiBase
+{
 private:
        // get_biome_id(biomename)
        // returns the biome id used in biomemap

diff --git a/src/script/lua_api/l_sound.h b/src/script/lua_api/l_sound.h
index 86ba9087bca18c8e1b20779805f674a3d73747b1..1f0c1eba16d826b2e20c19dfb1ca168325a5816d 100644 (file)
--- a/src/script/lua_api/l_sound.h
+++ b/src/script/lua_api/l_sound.h
@@ -23,12 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "lua_api/l_base.h"
 
-
-class ModApiSound: public ModApiBase
+class ModApiSound : public ModApiBase
 {
 private:
        static int l_sound_play(lua_State *L);
        static int l_sound_stop(lua_State *L);
+
 public:
        static void Initialize(lua_State *L, int top);
 };

diff --git a/src/script/lua_api/l_storage.h b/src/script/lua_api/l_storage.h
index fde2828ad075a3077793b8b0bfccf243e8803506..e09b8b39144d2df2f81c3a77a6dc1591564bc1cf 100644 (file)
--- a/src/script/lua_api/l_storage.h
+++ b/src/script/lua_api/l_storage.h
@@ -21,21 +21,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef __L_STORAGE_H__
 #define __L_STORAGE_H__
 
-#include "lua_api/l_base.h"
 #include "l_metadata.h"
+#include "lua_api/l_base.h"
 
 class ModMetadata;
 
-class ModApiStorage: public ModApiBase
+class ModApiStorage : public ModApiBase
 {
 protected:
        static int l_get_mod_storage(lua_State *L);
+
 public:
        static void Initialize(lua_State *L, int top);
-
 };
 
-class StorageRef: public MetaDataRef
+class StorageRef : public MetaDataRef
 {
 private:
        ModMetadata *m_object;
@@ -43,11 +43,12 @@ private:
        static const char className[];
        static const luaL_reg methods[];
 
-       virtual Metadata* getmeta(bool auto_create);
+       virtual Metadata *getmeta(bool auto_create);
        virtual void clearMeta();
 
        // garbage collector
        static int gc_object(lua_State *L);
+
 public:
        StorageRef(ModMetadata *object);
        ~StorageRef() {}
@@ -56,7 +57,7 @@ public:
        static void create(lua_State *L, ModMetadata *object);
 
        static StorageRef *checkobject(lua_State *L, int narg);
-       static ModMetadata* getobject(StorageRef *ref);
+       static ModMetadata *getobject(StorageRef *ref);
 };
 
 #endif /* __L_STORAGE_H__ */

diff --git a/src/script/lua_api/l_util.h b/src/script/lua_api/l_util.h
index eef32c0a1171ac8fe4547b0e0533a58cce9eae53..7325a841a9c5554ddf424a5a1c2de1cafef719a2 100644 (file)
--- a/src/script/lua_api/l_util.h
+++ b/src/script/lua_api/l_util.h
@@ -24,7 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class AsyncEngine;
 
-class ModApiUtil : public ModApiBase {
+class ModApiUtil : public ModApiBase
+{
 private:
        /*
                NOTE:
@@ -112,9 +113,7 @@ public:
 
        static void InitializeClient(lua_State *L, int top);
 
-       static void InitializeAsync(AsyncEngine& engine);
-
+       static void InitializeAsync(AsyncEngine &engine);
 };
 
 #endif /* L_UTIL_H_ */
-

diff --git a/src/script/lua_api/l_vmanip.h b/src/script/lua_api/l_vmanip.h
index 1adb78c4eea9afc850116191117961037b43df12..65fc0d97ada8aaa724e558b0553001d10f4a570c 100644 (file)
--- a/src/script/lua_api/l_vmanip.h
+++ b/src/script/lua_api/l_vmanip.h
@@ -20,9 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef L_VMANIP_H_
 #define L_VMANIP_H_
 
-#include "lua_api/l_base.h"
-#include "irr_v3d.h"
 #include <map>
+#include "irr_v3d.h"
+#include "lua_api/l_base.h"
 
 class Map;
 class MapBlock;
@@ -31,7 +31,8 @@ class MMVManip;
 /*
   VoxelManip
  */
-class LuaVoxelManip : public ModApiBase {
+class LuaVoxelManip : public ModApiBase
+{
 private:
        std::map<v3s16, MapBlock *> modified_blocks;
        bool is_mapgen_vm;

diff --git a/src/sky.h b/src/sky.h
index 17d6c5f73ec3249f7119ff64dfec86d03912fccd..72cb2d581735bc8327404fbe51dd31952d5592c5 100644 (file)
--- a/src/sky.h
+++ b/src/sky.h
@@ -17,9 +17,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "irrlichttypes_extrabloated.h"
 #include <ISceneNode.h>
 #include "camera.h"
+#include "irrlichttypes_extrabloated.h"
 
 #ifndef SKY_HEADER
 #define SKY_HEADER
@@ -34,7 +34,7 @@ class Sky : public scene::ISceneNode
 {
 public:
        //! constructor
-       Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
+       Sky(scene::ISceneNode *parent, scene::ISceneManager *mgr, s32 id,
                        ITextureSource *tsrc);
 
        virtual void OnRegisterSceneNode();
@@ -42,22 +42,18 @@ public:
        //! renders the node.
        virtual void render();
 
-       virtual const aabb3f &getBoundingBox() const
-       { return m_box; }
+       virtual const aabb3f &getBoundingBox() const { return m_box; }
 
        // Used by Irrlicht for optimizing rendering
-       virtual video::SMaterial& getMaterial(u32 i)
-       { return m_materials[i]; }
+       virtual video::SMaterial &getMaterial(u32 i) { return m_materials[i]; }
 
        // Used by Irrlicht for optimizing rendering
-       virtual u32 getMaterialCount() const
-       { return SKY_MATERIAL_COUNT; }
+       virtual u32 getMaterialCount() const { return SKY_MATERIAL_COUNT; }
 
-       void update(float m_time_of_day, float time_brightness,
-                       float direct_brightness, bool sunlight_seen, CameraMode cam_mode,
-                       float yaw, float pitch);
+       void update(float m_time_of_day, float time_brightness, float direct_brightness,
+                       bool sunlight_seen, CameraMode cam_mode, float yaw, float pitch);
 
-       float getBrightness(){ return m_brightness; }
+       float getBrightness() { return m_brightness; }
 
        const video::SColor &getBgColor() const
        {
@@ -72,8 +68,9 @@ public:
        bool getCloudsVisible() { return m_clouds_visible && m_visible; }
        const video::SColorf &getCloudColor() { return m_cloudcolor_f; }
 
-       void setVisible(bool visible){ m_visible = visible; }
-       void setFallbackBgColor(const video::SColor &fallback_bg_color){
+       void setVisible(bool visible) { m_visible = visible; }
+       void setFallbackBgColor(const video::SColor &fallback_bg_color)
+       {
                m_fallback_bg_color = fallback_bg_color;
        }
 
@@ -86,7 +83,8 @@ private:
        {
                if (!m_sunlight_seen)
                        return 0;
-               float x = m_time_of_day >= 0.5 ? (1 - m_time_of_day) * 2 : m_time_of_day * 2;
+               float x = m_time_of_day >= 0.5 ? (1 - m_time_of_day) * 2
+                                              : m_time_of_day * 2;
 
                if (x <= 0.3)
                        return 0;
@@ -101,19 +99,19 @@ private:
        video::SColor m_mix_scolor(video::SColor col1, video::SColor col2, f32 factor)
        {
                video::SColor result = video::SColor(
-                       col1.getAlpha() * (1 - factor) + col2.getAlpha() * factor,
-                       col1.getRed() * (1 - factor) + col2.getRed() * factor,
-                       col1.getGreen() * (1 - factor) + col2.getGreen() * factor,
-                       col1.getBlue() * (1 - factor) + col2.getBlue() * factor);
+                               col1.getAlpha() * (1 - factor) + col2.getAlpha() * factor,
+                               col1.getRed() * (1 - factor) + col2.getRed() * factor,
+                               col1.getGreen() * (1 - factor) + col2.getGreen() * factor,
+                               col1.getBlue() * (1 - factor) + col2.getBlue() * factor);
                return result;
        }
        video::SColorf m_mix_scolorf(video::SColorf col1, video::SColorf col2, f32 factor)
        {
-               video::SColorf result = video::SColorf(
-                       col1.r * (1 - factor) + col2.r * factor,
-                       col1.g * (1 - factor) + col2.g * factor,
-                       col1.b * (1 - factor) + col2.b * factor,
-                       col1.a * (1 - factor) + col2.a * factor);
+               video::SColorf result =
+                               video::SColorf(col1.r * (1 - factor) + col2.r * factor,
+                                               col1.g * (1 - factor) + col2.g * factor,
+                                               col1.b * (1 - factor) + col2.b * factor,
+                                               col1.a * (1 - factor) + col2.a * factor);
                return result;
        }
 
@@ -134,12 +132,11 @@ private:
        video::SColor m_skycolor;
        video::SColorf m_cloudcolor_f;
        v3f m_stars[SKY_STAR_COUNT];
-       video::S3DVertex m_star_vertices[SKY_STAR_COUNT*4];
-       video::ITexture* m_sun_texture;
-       video::ITexture* m_moon_texture;
-       video::ITexture* m_sun_tonemap;
-       video::ITexture* m_moon_tonemap;
+       video::S3DVertex m_star_vertices[SKY_STAR_COUNT * 4];
+       video::ITexture *m_sun_texture;
+       video::ITexture *m_moon_texture;
+       video::ITexture *m_sun_tonemap;
+       video::ITexture *m_moon_tonemap;
 };
 
 #endif
-

diff --git a/src/sound.h b/src/sound.h
index c21401e8ba946751525b72b873c38ebc7329b670..ba2d629d2db1a6ea98d530279f0fbcb51585f4ba 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -20,9 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SOUND_HEADER
 #define SOUND_HEADER
 
-#include "irrlichttypes_bloated.h"
-#include <string>
 #include <set>
+#include <string>
+#include "irrlichttypes_bloated.h"
 
 class OnDemandSoundFetcher
 {
@@ -36,61 +36,68 @@ struct SimpleSoundSpec
 {
        std::string name;
        float gain;
-       SimpleSoundSpec(std::string name="", float gain=1.0):
-               name(name),
-               gain(gain)
-       {}
-       bool exists() {return name != "";}
+       SimpleSoundSpec(std::string name = "", float gain = 1.0) : name(name), gain(gain)
+       {
+       }
+       bool exists() { return name != ""; }
        // Serialization intentionally left out
 };
 
 class ISoundManager
 {
 public:
-       virtual ~ISoundManager(){}
-       
+       virtual ~ISoundManager() {}
+
        // Multiple sounds can be loaded per name; when played, the sound
        // should be chosen randomly from alternatives
        // Return value determines success/failure
-       virtual bool loadSoundFile(const std::string &name,
-                       const std::string &filepath) = 0;
-       virtual bool loadSoundData(const std::string &name,
-                       const std::string &filedata) = 0;
+       virtual bool loadSoundFile(
+                       const std::string &name, const std::string &filepath) = 0;
+       virtual bool loadSoundData(
+                       const std::string &name, const std::string &filedata) = 0;
 
        virtual void updateListener(v3f pos, v3f vel, v3f at, v3f up) = 0;
        virtual void setListenerGain(float gain) = 0;
 
        // playSound functions return -1 on failure, otherwise a handle to the
        // sound. If name=="", call should be ignored without error.
-       virtual int playSound(const std::string &name, bool loop,
-                       float volume) = 0;
-       virtual int playSoundAt(const std::string &name, bool loop,
-                       float volume, v3f pos) = 0;
+       virtual int playSound(const std::string &name, bool loop, float volume) = 0;
+       virtual int playSoundAt(
+                       const std::string &name, bool loop, float volume, v3f pos) = 0;
        virtual void stopSound(int sound) = 0;
        virtual bool soundExists(int sound) = 0;
        virtual void updateSoundPosition(int sound, v3f pos) = 0;
 
        int playSound(const SimpleSoundSpec &spec, bool loop)
-               { return playSound(spec.name, loop, spec.gain); }
+       {
+               return playSound(spec.name, loop, spec.gain);
+       }
        int playSoundAt(const SimpleSoundSpec &spec, bool loop, v3f pos)
-               { return playSoundAt(spec.name, loop, spec.gain, pos); }
+       {
+               return playSoundAt(spec.name, loop, spec.gain, pos);
+       }
 };
 
-class DummySoundManager: public ISoundManager
+class DummySoundManager : public ISoundManager
 {
 public:
-       virtual bool loadSoundFile(const std::string &name,
-                       const std::string &filepath) {return true;}
-       virtual bool loadSoundData(const std::string &name,
-                       const std::string &filedata) {return true;}
+       virtual bool loadSoundFile(const std::string &name, const std::string &filepath)
+       {
+               return true;
+       }
+       virtual bool loadSoundData(const std::string &name, const std::string &filedata)
+       {
+               return true;
+       }
        void updateListener(v3f pos, v3f vel, v3f at, v3f up) {}
        void setListenerGain(float gain) {}
-       int playSound(const std::string &name, bool loop,
-                       float volume) {return 0;}
-       int playSoundAt(const std::string &name, bool loop,
-                       float volume, v3f pos) {return 0;}
+       int playSound(const std::string &name, bool loop, float volume) { return 0; }
+       int playSoundAt(const std::string &name, bool loop, float volume, v3f pos)
+       {
+               return 0;
+       }
        void stopSound(int sound) {}
-       bool soundExists(int sound) {return false;}
+       bool soundExists(int sound) { return false; }
        void updateSoundPosition(int sound, v3f pos) {}
 };
 
@@ -98,4 +105,3 @@ public:
 extern DummySoundManager dummySoundManager;
 
 #endif
-

diff --git a/src/util/hex.h b/src/util/hex.h
index 6f00a79bff0a451115f4e1230fc1aa430d71203c..c205d01da3f8e443f307b9e1d02a6b03f33ed7ba 100644 (file)
--- a/src/util/hex.h
+++ b/src/util/hex.h
@@ -30,9 +30,8 @@ static inline std::string hex_encode(const char *data, unsigned int data_size)
        char buf2[3];
        buf2[2] = '\0';
 
-       for(unsigned int i = 0; i < data_size; i++)
-       {
-               unsigned char c = (unsigned char) data[i];
+       for (unsigned int i = 0; i < data_size; i++) {
+               unsigned char c = (unsigned char)data[i];
                buf2[0] = hex_chars[(c & 0xf0) >> 4];
                buf2[1] = hex_chars[c & 0x0f];
                ret.append(buf2);
@@ -43,16 +42,16 @@ static inline std::string hex_encode(const char *data, unsigned int data_size)
 
 static inline std::string hex_encode(const std::string &data)
 {
-    return hex_encode(data.c_str(), data.size());
+       return hex_encode(data.c_str(), data.size());
 }
 
 static inline bool hex_digit_decode(char hexdigit, unsigned char &value)
 {
-       if(hexdigit >= '0' && hexdigit <= '9')
+       if (hexdigit >= '0' && hexdigit <= '9')
                value = hexdigit - '0';
-       else if(hexdigit >= 'A' && hexdigit <= 'F')
+       else if (hexdigit >= 'A' && hexdigit <= 'F')
                value = hexdigit - 'A' + 10;
-       else if(hexdigit >= 'a' && hexdigit <= 'f')
+       else if (hexdigit >= 'a' && hexdigit <= 'f')
                value = hexdigit - 'a' + 10;
        else
                return false;

diff --git a/src/util/sha1.h b/src/util/sha1.h
index c04947373e012ca417cbe8ffdf8f9ea566c93484..0ac08c67b9fb76217c0650d2da2c02fc5b7b123a 100644 (file)
--- a/src/util/sha1.h
+++ b/src/util/sha1.h
@@ -29,22 +29,23 @@ typedef unsigned int Uint32;
 
 class SHA1
 {
-       private:
-               // fields
-               Uint32 H0, H1, H2, H3, H4;
-               unsigned char bytes[64];
-               int unprocessedBytes;
-               Uint32 size;
-               void process();
-       public:
-               SHA1();
-               ~SHA1();
-               void addBytes( const char* data, int num );
-               unsigned char* getDigest();
-               // utility methods
-               static Uint32 lrot( Uint32 x, int bits );
-               static void storeBigEndianUint32( unsigned char* byte, Uint32 num );
-               static void hexPrinter( unsigned char* c, int l );
+private:
+       // fields
+       Uint32 H0, H1, H2, H3, H4;
+       unsigned char bytes[64];
+       int unprocessedBytes;
+       Uint32 size;
+       void process();
+
+public:
+       SHA1();
+       ~SHA1();
+       void addBytes(const char *data, int num);
+       unsigned char *getDigest();
+       // utility methods
+       static Uint32 lrot(Uint32 x, int bits);
+       static void storeBigEndianUint32(unsigned char *byte, Uint32 num);
+       static void hexPrinter(unsigned char *c, int l);
 };
 
 #define SHA1_HEADER

diff --git a/src/util/sha2.h b/src/util/sha2.h
index 6ac045febe5894136b61c15b7771d207d81f0f64..233c85a8185f952707447ac7008e1b23cf358c3a 100644 (file)
--- a/src/util/sha2.h
+++ b/src/util/sha2.h
@@ -57,21 +57,21 @@
  */
 
 #ifndef HEADER_SHA_H
-# define HEADER_SHA_H
+#define HEADER_SHA_H
 
-# include <stddef.h>
+#include <stddef.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
-#  error SHA is disabled.
-# endif
+#if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
+#error SHA is disabled.
+#endif
 
-# if defined(OPENSSL_FIPS)
-#  define FIPS_SHA_SIZE_T size_t
-# endif
+#if defined(OPENSSL_FIPS)
+#define FIPS_SHA_SIZE_T size_t
+#endif
 
 /*
        Compat stuff from OpenSSL land
@@ -79,11 +79,10 @@ extern "C" {
 
 /* crypto.h */
 
-# define fips_md_init(alg) fips_md_init_ctx(alg, alg)
+#define fips_md_init(alg) fips_md_init_ctx(alg, alg)
 
-# define fips_md_init_ctx(alg, cx) \
-        int alg##_Init(cx##_CTX *c)
-# define fips_cipher_abort(alg) while(0)
+#define fips_md_init_ctx(alg, cx) int alg##_Init(cx##_CTX *c)
+#define fips_cipher_abort(alg) while (0)
 
 /*-
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -92,47 +91,51 @@ extern "C" {
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  */
 
-# if defined(__LP32__)
-#  define SHA_LONG unsigned long
-# elif defined(__ILP64__)
-#  define SHA_LONG unsigned long
-#  define SHA_LONG_LOG2 3
-# else
-#  define SHA_LONG unsigned int
-# endif
-
-# define SHA_LBLOCK      16
-# define SHA_CBLOCK      (SHA_LBLOCK*4)/* SHA treats input data as a
-                                        * contiguous array of 32 bit wide
-                                        * big-endian values. */
-# define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
-# define SHA_DIGEST_LENGTH 20
-
-typedef struct SHAstate_st {
-    SHA_LONG h0, h1, h2, h3, h4;
-    SHA_LONG Nl, Nh;
-    SHA_LONG data[SHA_LBLOCK];
-    unsigned int num;
+#if defined(__LP32__)
+#define SHA_LONG unsigned long
+#elif defined(__ILP64__)
+#define SHA_LONG unsigned long
+#define SHA_LONG_LOG2 3
+#else
+#define SHA_LONG unsigned int
+#endif
+
+#define SHA_LBLOCK 16
+#define SHA_CBLOCK                                                                       \
+       (SHA_LBLOCK * 4) /* SHA treats input data as a                                   \
+                         * contiguous array of 32 bit wide                              \
+                         * big-endian values. */
+#define SHA_LAST_BLOCK (SHA_CBLOCK - 8)
+#define SHA_DIGEST_LENGTH 20
+
+typedef struct SHAstate_st
+{
+       SHA_LONG h0, h1, h2, h3, h4;
+       SHA_LONG Nl, Nh;
+       SHA_LONG data[SHA_LBLOCK];
+       unsigned int num;
 } SHA_CTX;
 
-# define SHA256_CBLOCK   (SHA_LBLOCK*4)/* SHA-256 treats input data as a
-                                        * contiguous array of 32 bit wide
-                                        * big-endian values. */
-# define SHA224_DIGEST_LENGTH    28
-# define SHA256_DIGEST_LENGTH    32
-
-typedef struct SHA256state_st {
-    SHA_LONG h[8];
-    SHA_LONG Nl, Nh;
-    SHA_LONG data[SHA_LBLOCK];
-    unsigned int num, md_len;
+#define SHA256_CBLOCK                                                                    \
+       (SHA_LBLOCK * 4) /* SHA-256 treats input data as a                               \
+                         * contiguous array of 32 bit wide                              \
+                         * big-endian values. */
+#define SHA224_DIGEST_LENGTH 28
+#define SHA256_DIGEST_LENGTH 32
+
+typedef struct SHA256state_st
+{
+       SHA_LONG h[8];
+       SHA_LONG Nl, Nh;
+       SHA_LONG data[SHA_LBLOCK];
+       unsigned int num, md_len;
 } SHA256_CTX;
 
-# ifndef OPENSSL_NO_SHA256
-#  ifdef OPENSSL_FIPS
+#ifndef OPENSSL_NO_SHA256
+#ifdef OPENSSL_FIPS
 int private_SHA224_Init(SHA256_CTX *c);
 int private_SHA256_Init(SHA256_CTX *c);
-#  endif
+#endif
 int SHA224_Init(SHA256_CTX *c);
 int SHA224_Update(SHA256_CTX *c, const void *data, size_t len);
 int SHA224_Final(unsigned char *md, SHA256_CTX *c);
@@ -142,12 +145,12 @@ int SHA256_Update(SHA256_CTX *c, const void *data, size_t len);
 int SHA256_Final(unsigned char *md, SHA256_CTX *c);
 unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md);
 void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
-# endif
+#endif
 
-# define SHA384_DIGEST_LENGTH    48
-# define SHA512_DIGEST_LENGTH    64
+#define SHA384_DIGEST_LENGTH 48
+#define SHA512_DIGEST_LENGTH 64
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 

diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index 0dcc7713d3624c6c1d80279d0989bf6393fe125f..fb3b212715a64d33543978ed6957d235ecefb0d6 100644 (file)
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -229,7 +229,6 @@ src/raycast.h
 src/reflowscan.cpp
 src/reflowscan.h
 src/remoteplayer.cpp
-src/remoteplayer.h
 src/rollback.cpp
 src/rollback.h
 src/rollback_interface.cpp
@@ -291,7 +290,6 @@ src/script/lua_api/l_itemstackmeta.h
 src/script/lua_api/l_mainmenu.cpp
 src/script/lua_api/l_mainmenu.h
 src/script/lua_api/l_mapgen.cpp
-src/script/lua_api/l_mapgen.h
 src/script/lua_api/l_metadata.cpp
 src/script/lua_api/l_metadata.h
 src/script/lua_api/l_minimap.cpp
@@ -313,13 +311,9 @@ src/script/lua_api/l_server.h
 src/script/lua_api/l_settings.cpp
 src/script/lua_api/l_settings.h
 src/script/lua_api/l_sound.cpp
-src/script/lua_api/l_sound.h
 src/script/lua_api/l_storage.cpp
-src/script/lua_api/l_storage.h
 src/script/lua_api/l_util.cpp
-src/script/lua_api/l_util.h
 src/script/lua_api/l_vmanip.cpp
-src/script/lua_api/l_vmanip.h
 src/script/scripting_mainmenu.cpp
 src/script/scripting_mainmenu.h
 src/script/serverscripting.cpp
@@ -340,11 +334,9 @@ src/settings_translation_file.cpp
 src/shader.cpp
 src/shader.h
 src/sky.cpp
-src/sky.h
 src/socket.cpp
 src/socket.h
 src/sound.cpp
-src/sound.h
 src/sound_openal.cpp
 src/sound_openal.h
 src/staticobject.cpp
@@ -411,7 +403,6 @@ src/util/directiontables.cpp
 src/util/directiontables.h
 src/util/enriched_string.cpp
 src/util/enriched_string.h
-src/util/hex.h
 src/util/md32_common.h
 src/util/numeric.cpp
 src/util/numeric.h
@@ -421,8 +412,6 @@ src/util/pointer.h
 src/util/serialize.cpp
 src/util/serialize.h
 src/util/sha1.cpp
-src/util/sha1.h
-src/util/sha2.h
 src/util/srp.cpp
 src/util/srp.h
 src/util/strfnd.h