new upstream release (3.3.0); modify package compatibility for Stretch

[ossec-hids.git] / src / win32 / ui / os_win32ui.h

diff --git a/src/win32/ui/os_win32ui.h b/src/win32/ui/os_win32ui.h
index 3952824..ce0f625 100644 (file)
--- a/src/win32/ui/os_win32ui.h
+++ b/src/win32/ui/os_win32ui.h
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/win32/ui/os_win32ui.h, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All rights reserved.
  *
@@ -8,13 +5,8 @@
  * and/or modify it under the terms of the GNU General Public
  * License (version 2) as published by the FSF - Free Software
  * Foundation.
- *
- * License details at the LICENSE file included with OSSEC or
- * online at: http://www.ossec.net/en/licensing.html
  */
 
-
-
 #ifndef WIN_32UI_H
 #define WIN_32UI_H
 
@@ -24,10 +16,8 @@
 #include <winresrc.h>
 #include <commctrl.h>
 
-
 /* Default values */
 #define CONFIG          "ossec.conf"
-#define NEWCONFIG       "new-ossec.conf"
 #define LASTCONFIG      "last-ossec.conf"
 #define VERSION_FILE    "VERSION.txt"
 #define OSSECLOGS       "ossec.log"
@@ -35,7 +25,6 @@
 #define SENDER_FILE     "rids\\sender_counter"
 #define DEFDIR          "C:\\Program Files\\ossec-agent"
 
-
 /* Status messages */
 #define ST_RUNNING          "Running"
 #define ST_RUNNING_RESTART  "Running (pending restart)"
@@ -50,23 +39,18 @@
                             "            Missing OSSEC Server IP address.\r\n" \
                             "            - Not Running"
 
-
-
 /* Pre-def fields */
 #define FL_NOKEY        "<insert_auth_key_here>"
 #define FL_NOSERVER     "<insert_server_ip_here>"
 #define SERVER_IP_USED      1
 #define SERVER_HOST_USED    2
 
-
 /* Prototypes */
 char *decode_base64(const char *src);
 char *encode_base64(int size, char *src);
 
-
 /* Global ossec config structure */
-typedef struct _ossec_config
-{
+typedef struct _ossec_config {
     unsigned short int server_type;
     unsigned short int admin_access;
     unsigned long int msg_sent;
@@ -82,13 +66,13 @@ typedef struct _ossec_config
     char *version;
     char *install_date;
     char *status;
-}ossec_config;
+} ossec_config;
 
 
 /** Global variables **/
 
 /* Agent status */
-char ui_server_info[2048 +1];
+char ui_server_info[2048 + 1];
 
 /* Configuration */
 ossec_config config_inst;
@@ -96,8 +80,6 @@ ossec_config config_inst;
 /* Status bar */
 HWND hStatus;
 
-
-
 /* Ossec icon */
 #define IDI_OSSECICON  201
 #define UI_MANIFEST_ID 202
@@ -110,7 +92,6 @@ HWND hStatus;
 #define UI_SERVER_INFO      1505
 #define UI_ID_CLOSE         1510
 
-
 /* Menu values */
 #define UI_MENU_MANAGE_STOP     1601
 #define UI_MENU_MANAGE_START    1602
@@ -123,7 +104,6 @@ HWND hStatus;
 #define UI_MENU_HELP_ABOUT      1609
 #define UI_MENU_NONE            1610
 
-
 #define IDD_MAIN                1700
 #define IDC_MAIN_STATUS         1701
 #define IDC_ADD                 1702
@@ -131,16 +111,13 @@ HWND hStatus;
 #define IDD_ABOUT               1704
 #define IDC_STATIC -1
 
-
 /** Prototypes **/
 
 /* Generate server info */
 int gen_server_info(HWND hwnd);
 
-/* cat file */
 char *cat_file(char *file, FILE *fp2);
 
-/* is_file present */
 int is_file(char *file);
 
 /* Reads ossec config */
@@ -163,5 +140,3 @@ int get_ossec_server();
 
 
 #endif
-
-/* EOF */