Cleanup rp_cpu.c

include/common.h

@@ -41,9 +41,6 @@
 
 #define DEVICES_MAX   128
 
-
-
-
 #define CEIL(a) ((a - (int) (a)) > 0 ? a + 1 : a)
 
 #if defined (__APPLE__)
@@ -60,4 +57,10 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#if defined (_WIN)
+#define EOL "\r\n"
+#else
+#define EOL "\n"
+#endif
+
 #endif // _COMMON_H

include/rp_cpu.h

@@ -86,11 +86,11 @@ typedef struct
 
 } kernel_rule_t;
 
-int cpu_rule_to_kernel_rule (char *rule_buf, uint rule_len, kernel_rule_t *rule);
-int kernel_rule_to_cpu_rule (char *rule_buf, kernel_rule_t *rule);
-
 int generate_random_rule (char rule_buf[RP_RULE_BUFSIZ], u32 rp_gen_func_min, u32 rp_gen_func_max);
 
 int _old_apply_rule (char *rule, int rule_len, char in[BLOCK_SIZE], int in_len, char out[BLOCK_SIZE]);
 
+int cpu_rule_to_kernel_rule (char *rule_buf, uint rule_len, kernel_rule_t *rule);
+int kernel_rule_to_cpu_rule (char *rule_buf, kernel_rule_t *rule);
+
 #endif // _RP_CPU_H

include/types.h

@@ -13,11 +13,6 @@
 #include <sys/stat.h>
 #include <string.h>
 
-#if defined (_WIN)
-#define EOL "\r\n"
-#else
-#define EOL "\n"
-#endif
 
 /**
  * Outfile formats
@@ -43,16 +38,16 @@ typedef enum hl_mode
 
 typedef enum hlfmt_name
 {
-   HLFMT_HASHCAT  = 0,
-   HLFMT_PWDUMP   = 1,
-   HLFMT_PASSWD   = 2,
-   HLFMT_SHADOW   = 3,
-   HLFMT_DCC      = 4,
-   HLFMT_DCC2     = 5,
-   HLFMT_NETNTLM1 = 7,
-   HLFMT_NETNTLM2 = 8,
-   HLFMT_NSLDAP   = 9,
-   HLFMT_NSLDAPS  = 10
+  HLFMT_HASHCAT  = 0,
+  HLFMT_PWDUMP   = 1,
+  HLFMT_PASSWD   = 2,
+  HLFMT_SHADOW   = 3,
+  HLFMT_DCC      = 4,
+  HLFMT_DCC2     = 5,
+  HLFMT_NETNTLM1 = 7,
+  HLFMT_NETNTLM2 = 8,
+  HLFMT_NSLDAP   = 9,
+  HLFMT_NSLDAPS  = 10
 
 } hlfmt_name_t;