minimal fixes to visual test, so that it actually builds w/o warnings:

- linux_process.c: add an SDLVisualTest_ScreenshotProcess() stub for
  linux builds succeed.
- action_configparser.c: fixes -Wswitch warnings.
- testharness.c: fixes 'is used uninitialized' warnings for userevents.
- testharness.c: fixes format string argument to 'Force killing...'
- testquit.c: fix type of options array in main().
- windows_screenshot.c: lowercase windows.h header name.
- ran dos2unix on all sources and add missing newlines at files' ends.
- minor adjustments to autotools build system (which actually seems to
  need more surgery for unnecessary stuff...)

visualtest/src/action_configparser.c

@@ -36,6 +36,9 @@ FreeAction(SDLVisualTest_Action* action)
             action->extra.process.args = NULL;
         }
         break;
+
+      default:
+        break;
     }
 }
 

visualtest/src/linux/linux_process.c

@@ -1,199 +1,208 @@
-/* See LICENSE.txt for the full license governing this code. */
-/**
- *  \file linux_process.c
- * 
- *  Source file for the process API on linux.
- */
-
-
-#include <SDL.h>
-#include <SDL_test.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "SDL_visualtest_process.h"
-#include "SDL_visualtest_harness_argparser.h"
-#include "SDL_visualtest_parsehelper.h"
-
-#if defined(__LINUX__)
-
-static void
-LogLastError(char* str)
-{
-    char* error = (char*)strerror(errno);
-    if(!str || !error)
-    	return;
-    SDLTest_LogError("%s: %s", str, error);
-}
-
-int
-SDL_LaunchProcess(char* file, char* args, SDL_ProcessInfo* pinfo)
-{
-    pid_t pid;
-    char** argv;
-
-    if(!file)
-    {
-        SDLTest_LogError("file argument cannot be NULL");
-        return 0;
-    }
-    if(!pinfo)
-    {
-        SDLTest_LogError("pinfo cannot be NULL");
-        return 0;
-    }
-    pid = fork();
-    if(pid == -1)
-    {
-        LogLastError("fork() failed");
-        return 0;
-    }
-    else if(pid == 0)
-    {
-        /* parse the arguments string */
-        argv = SDLVisualTest_ParseArgsToArgv(args);
-        argv[0] = file;
-        execv(file, argv);
-        LogLastError("execv() failed");
-        return 0;
-    }
-    else
-    {
-        pinfo->pid = pid;
-        return 1;
-    }
-
-    /* never executed */
-    return 0;
-}
-
-int
-SDL_GetProcessExitStatus(SDL_ProcessInfo* pinfo, SDL_ProcessExitStatus* ps)
-{
-    int success, status;
-    if(!pinfo)
-    {
-        SDLTest_LogError("pinfo argument cannot be NULL");
-        return 0;
-    }
-    if(!ps)
-    {
-        SDLTest_LogError("ps argument cannot be NULL");
-        return 0;
-    }
-    success = waitpid(pinfo->pid, &status, WNOHANG);
-    if(success == -1)
-    {
-        LogLastError("waitpid() failed");
-        return 0;
-    }
-    else if(success == 0)
-    {
-        ps->exit_status = -1;
-        ps->exit_success = 1;
-    }
-    else
-    {
-        ps->exit_success = WIFEXITED(status);
-        ps->exit_status = WEXITSTATUS(status);
-    }
-    return 1;
-}
-
-int
-SDL_IsProcessRunning(SDL_ProcessInfo* pinfo)
-{
-    int success;
-
-    if(!pinfo)
-    {
-        SDLTest_LogError("pinfo cannot be NULL");
-        return -1;
-    }
-
-    success = kill(pinfo->pid, 0);
-    if(success == -1)
-    {
-        if(errno == ESRCH) /* process is not running */
-            return 0;
-        else
-        {
-            LogLastError("kill() failed");
-            return -1;
-        }
-    }
-    return 1;
-}
-
-int
-SDL_QuitProcess(SDL_ProcessInfo* pinfo, SDL_ProcessExitStatus* ps)
-{
-    int success, status;
-
-    if(!pinfo)
-    {
-        SDLTest_LogError("pinfo argument cannot be NULL");
-        return 0;
-    }
-    if(!ps)
-    {
-        SDLTest_LogError("ps argument cannot be NULL");
-        return 0;
-    }
-
-    success = kill(pinfo->pid, SIGQUIT);
-    if(success == -1)
-    {
-        LogLastError("kill() failed");
-        return 0;
-    }
-
-    success = waitpid(pinfo->pid, &status, 0);
-    if(success == -1)
-    {
-        LogLastError("waitpid() failed");
-        return 0;
-    }
-
-    ps->exit_success = WIFEXITED(status);
-    ps->exit_status = WEXITSTATUS(status);
-    return 1;
-}
-
-int
-SDL_KillProcess(SDL_ProcessInfo* pinfo, SDL_ProcessExitStatus* ps)
-{
-    int success, status;
-
-    if(!pinfo)
-    {
-        SDLTest_LogError("pinfo argument cannot be NULL");
-        return 0;
-    }
-    if(!ps)
-    {
-        SDLTest_LogError("ps argument cannot be NULL");
-        return 0;
-    }
-
-    success = kill(pinfo->pid, SIGKILL);
-    if(success == -1)
-    {
-        LogLastError("kill() failed");
-        return 0;
-    }
-    success = waitpid(pinfo->pid, &status, 0);
-    if(success == -1)
-    {
-        LogLastError("waitpid() failed");
-        return 0;
-    }
-
-    ps->exit_success = WIFEXITED(status);
-    ps->exit_status = WEXITSTATUS(status);
-    return 1;
-}
-
-#endif
+/* See LICENSE.txt for the full license governing this code. */
+/**
+ *  \file linux_process.c
+ * 
+ *  Source file for the process API on linux.
+ */
+
+
+#include <SDL.h>
+#include <SDL_test.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "SDL_visualtest_process.h"
+#include "SDL_visualtest_harness_argparser.h"
+#include "SDL_visualtest_parsehelper.h"
+
+#if defined(__LINUX__)
+
+static void
+LogLastError(char* str)
+{
+    char* error = (char*)strerror(errno);
+    if(!str || !error)
+    	return;
+    SDLTest_LogError("%s: %s", str, error);
+}
+
+int
+SDL_LaunchProcess(char* file, char* args, SDL_ProcessInfo* pinfo)
+{
+    pid_t pid;
+    char** argv;
+
+    if(!file)
+    {
+        SDLTest_LogError("file argument cannot be NULL");
+        return 0;
+    }
+    if(!pinfo)
+    {
+        SDLTest_LogError("pinfo cannot be NULL");
+        return 0;
+    }
+    pid = fork();
+    if(pid == -1)
+    {
+        LogLastError("fork() failed");
+        return 0;
+    }
+    else if(pid == 0)
+    {
+        /* parse the arguments string */
+        argv = SDLVisualTest_ParseArgsToArgv(args);
+        argv[0] = file;
+        execv(file, argv);
+        LogLastError("execv() failed");
+        return 0;
+    }
+    else
+    {
+        pinfo->pid = pid;
+        return 1;
+    }
+
+    /* never executed */
+    return 0;
+}
+
+int
+SDL_GetProcessExitStatus(SDL_ProcessInfo* pinfo, SDL_ProcessExitStatus* ps)
+{
+    int success, status;
+    if(!pinfo)
+    {
+        SDLTest_LogError("pinfo argument cannot be NULL");
+        return 0;
+    }
+    if(!ps)
+    {
+        SDLTest_LogError("ps argument cannot be NULL");
+        return 0;
+    }
+    success = waitpid(pinfo->pid, &status, WNOHANG);
+    if(success == -1)
+    {
+        LogLastError("waitpid() failed");
+        return 0;
+    }
+    else if(success == 0)
+    {
+        ps->exit_status = -1;
+        ps->exit_success = 1;
+    }
+    else
+    {
+        ps->exit_success = WIFEXITED(status);
+        ps->exit_status = WEXITSTATUS(status);
+    }
+    return 1;
+}
+
+int
+SDL_IsProcessRunning(SDL_ProcessInfo* pinfo)
+{
+    int success;
+
+    if(!pinfo)
+    {
+        SDLTest_LogError("pinfo cannot be NULL");
+        return -1;
+    }
+
+    success = kill(pinfo->pid, 0);
+    if(success == -1)
+    {
+        if(errno == ESRCH) /* process is not running */
+            return 0;
+        else
+        {
+            LogLastError("kill() failed");
+            return -1;
+        }
+    }
+    return 1;
+}
+
+int
+SDL_QuitProcess(SDL_ProcessInfo* pinfo, SDL_ProcessExitStatus* ps)
+{
+    int success, status;
+
+    if(!pinfo)
+    {
+        SDLTest_LogError("pinfo argument cannot be NULL");
+        return 0;
+    }
+    if(!ps)
+    {
+        SDLTest_LogError("ps argument cannot be NULL");
+        return 0;
+    }
+
+    success = kill(pinfo->pid, SIGQUIT);
+    if(success == -1)
+    {
+        LogLastError("kill() failed");
+        return 0;
+    }
+
+    success = waitpid(pinfo->pid, &status, 0);
+    if(success == -1)
+    {
+        LogLastError("waitpid() failed");
+        return 0;
+    }
+
+    ps->exit_success = WIFEXITED(status);
+    ps->exit_status = WEXITSTATUS(status);
+    return 1;
+}
+
+int
+SDL_KillProcess(SDL_ProcessInfo* pinfo, SDL_ProcessExitStatus* ps)
+{
+    int success, status;
+
+    if(!pinfo)
+    {
+        SDLTest_LogError("pinfo argument cannot be NULL");
+        return 0;
+    }
+    if(!ps)
+    {
+        SDLTest_LogError("ps argument cannot be NULL");
+        return 0;
+    }
+
+    success = kill(pinfo->pid, SIGKILL);
+    if(success == -1)
+    {
+        LogLastError("kill() failed");
+        return 0;
+    }
+    success = waitpid(pinfo->pid, &status, 0);
+    if(success == -1)
+    {
+        LogLastError("waitpid() failed");
+        return 0;
+    }
+
+    ps->exit_success = WIFEXITED(status);
+    ps->exit_status = WEXITSTATUS(status);
+    return 1;
+}
+
+/* each window of the process will have a screenshot taken. The file name will be
+   prefix-i.png for the i'th window. */
+int
+SDLVisualTest_ScreenshotProcess(SDL_ProcessInfo* pinfo, char* prefix)
+{
+    SDLTest_LogError("Screenshot process not implemented");
+    return 0;
+}
+
+#endif

visualtest/src/mischelper.c

@@ -1,15 +1,15 @@
 /**
- * \file mischelper.c 
+ * \file mischelper.c
  *
  * Source file with miscellaneous helper functions.
  */
 
 #include <SDL_test.h>
 
-void
-SDLVisualTest_HashString(char* str, char hash[33])
-{
-    SDLTest_Md5Context md5c;
+void
+SDLVisualTest_HashString(char* str, char hash[33])
+{
+    SDLTest_Md5Context md5c;
     int i;
 
     if(!str)
@@ -20,9 +20,9 @@ SDLVisualTest_HashString(char* str, char hash[33])
 
     SDLTest_Md5Init(&md5c);
     SDLTest_Md5Update(&md5c, (unsigned char*)str, SDL_strlen(str));
-    SDLTest_Md5Final(&md5c);
-
-    /* convert the md5 hash to an array of hexadecimal digits */
+    SDLTest_Md5Final(&md5c);
+
+    /* convert the md5 hash to an array of hexadecimal digits */
     for(i = 0; i < 16; i++)
-        SDL_snprintf(hash + 2 * i, 33 - 2 * i, "%02x", (int)md5c.digest[i]);
-}
+        SDL_snprintf(hash + 2 * i, 33 - 2 * i, "%02x", (int)md5c.digest[i]);
+}

visualtest/src/parsehelper.c

@@ -18,7 +18,7 @@ CountTokens(char* args)
     int state; /* current state of the DFA */
 
     if(!args)
-    	return -1;
+        return -1;
 
     index = 0;
     state = 0;

visualtest/src/rwhelper.c

@@ -128,4 +128,4 @@ SDLVisualTest_RWHelperCountNonEmptyLines(SDL_RWops* rw,
                                          buffer, comment_char))
         num_lines++;
     return num_lines;
-}
+}

visualtest/src/screenshot.c

@@ -1,6 +1,6 @@
 /* See LICENSE.txt for the full license governing this code. */
 /**
- * \file screenshot.c 
+ * \file screenshot.c
  *
  * Source file for the screenshot API.
  */

visualtest/src/testharness.c

@@ -1,6 +1,6 @@
 /* See LICENSE.txt for the full license governing this code. */
 /**
- *  \file testharness.c 
+ *  \file testharness.c
  *
  *  Source file for the test harness.
  */
@@ -82,10 +82,10 @@ ActionTimerCallback(Uint32 interval, void* param)
     Uint32 next_action_time;
 
     /* push an event to handle the action */
+    SDL_zero(userevent);
     userevent.type = SDL_USEREVENT;
     userevent.code = ACTION_TIMER_EVENT;
     userevent.data1 = &current->action;
-    userevent.data2 = NULL;
 
     event.type = SDL_USEREVENT;
     event.user = userevent;
@@ -110,10 +110,9 @@ KillTimerCallback(Uint32 interval, void* param)
     SDL_Event event;
     SDL_UserEvent userevent;
 
+    SDL_zero(userevent);
     userevent.type = SDL_USEREVENT;
     userevent.code = KILL_TIMER_EVENT;
-    userevent.data1 = NULL;
-    userevent.data2 = NULL;
 
     event.type = SDL_USEREVENT;
     event.user = userevent;
@@ -181,7 +180,7 @@ ProcessAction(SDLVisualTest_Action* action, int* sut_running, char* args)
             if(SDL_IsProcessRunning(&action_process) > 0)
             {
                 SDLTest_LogError("Process %s took too long too complete."
-                                    " Force killing...", action->extra);
+                                 " Force killing...", action->extra.process.path);
                 if(!SDL_KillProcess(&action_process, &ps))
                 {
                     SDLTest_LogError("SDL_KillProcess() failed");
@@ -519,7 +518,7 @@ main(int argc, char* argv[])
         }
         goto cleanup_variator;
     }
- 
+
     goto cleanup_sdl;
 
 cleanup_variator:

visualtest/src/variator_exhaustive.c

@@ -39,6 +39,7 @@ NextVariation(SDLVisualTest_Variation* variation,
         return 0;
     if(carry == 0)
         return 1;
+
     SDLTest_LogError("NextVariation() failed");
     return -1;
 }
@@ -129,4 +130,4 @@ SDLVisualTest_FreeExhaustiveVariator(SDLVisualTest_ExhaustiveVariator* variator)
     }
     SDL_free(variator->variation.vars);
     variator->variation.vars = NULL;
-}
+}

visualtest/src/variator_random.c

@@ -47,12 +47,13 @@ SDLVisualTest_GetNextRandomVariation(SDLVisualTest_RandomVariator* variator)
     SDLVisualTest_SUTOptionValue* vars;
     SDLVisualTest_SUTOption* options;
     int i;
+
     if(!variator)
     {
         SDLTest_LogError("variator argument cannot be NULL");
         return NULL;
     }
- 
+
     /* to save typing */
     vars = variator->variation.vars;
     options = variator->config.options;
@@ -106,6 +107,7 @@ void SDLVisualTest_FreeRandomVariator(SDLVisualTest_RandomVariator* variator)
         SDLTest_LogError("variator argument cannot be NULL");
         return;
     }
+
     SDL_free(variator->variation.vars);
     variator->variation.vars = NULL;
-}
+}

visualtest/src/variators.c

@@ -53,6 +53,7 @@ SDLVisualTest_GetNextVariation(SDLVisualTest_Variator* variator)
         SDLTest_LogError("variator argument cannot be NULL");
         return NULL;
     }
+
     switch(variator->type)
     {
         case SDL_VARIATOR_EXHAUSTIVE:
@@ -77,6 +78,7 @@ void SDLVisualTest_FreeVariator(SDLVisualTest_Variator* variator)
         SDLTest_LogError("variator argument cannot be NULL");
         return;
     }
+
     switch(variator->type)
     {
         case SDL_VARIATOR_EXHAUSTIVE:
@@ -90,4 +92,4 @@ void SDLVisualTest_FreeVariator(SDLVisualTest_Variator* variator)
         default:
             SDLTest_LogError("Invalid value for variator type");
     }
-}
+}

visualtest/src/windows/windows_process.c

@@ -1,11 +1,10 @@
 /* See LICENSE.txt for the full license governing this code. */
 /**
- * \file windows_process.c 
+ * \file windows_process.c
  *
  * Source file for the process API on windows.
  */
 
-
 #include <SDL.h>
 #include <SDL_test.h>
 #include <string.h>

visualtest/src/windows/windows_screenshot.c

@@ -1,6 +1,6 @@
 /* See LICENSE.txt for the full license governing this code. */
 /**
- * \file windows_screenshot.c 
+ * \file windows_screenshot.c
  *
  * Source file for the screenshot API on windows.
  */
@@ -14,7 +14,7 @@
 #endif
 
 #if defined(__WIN32__)
-#include <Windows.h>
+#include <windows.h>
 
 void LogLastError(char* str);