bb6578 - Fixes TODO in session.c on converting to ENUM

clamd/scanner.h

@@ -21,10 +21,6 @@
 #ifndef __SCANNER_H
 #define __SCANNER_H
 
-#define TYPE_SCAN	0
-#define TYPE_CONTSCAN	1
-#define TYPE_MULTISCAN	2
-
 #include <sys/types.h>
 
 #include "libclamav/clamav.h"
@@ -32,6 +28,8 @@
 #include "thrmgr.h"
 #include "session.h"
 
+enum scan_type { TYPE_INIT = -1, TYPE_SCAN = 0, TYPE_CONTSCAN = 1, TYPE_MULTISCAN = 2 };
+
 struct scan_cb_data {
     int scantype;
     int odesc;

clamd/session.c

@@ -192,7 +192,7 @@ int command(client_conn_t *conn, int *virus)
     struct cl_engine *engine = conn->engine;
     unsigned int options = conn->options;
     const struct optstruct *opts = conn->opts;
-    int type = -1; /* TODO: make this enum */
+    enum scan_type type = TYPE_INIT;
     int maxdirrec;
     int ret = 0;
     int flags = CLI_FTW_STD;