From: Art Cancro <ajc@citadel.org>
Date: Fri, 24 Aug 2018 16:36:14 +0000 (-0400)
Subject: The new server API no longer uses upload_type.  Removed it from CitContext.
X-Git-Tag: v939~356
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e55c9fac2d5ce1ccc9239fb4155428f9c7d1bb6d

The new server API no longer uses upload_type.  Removed it from CitContext.
---

diff --git a/citadel/context.c b/citadel/context.c
index fd8b43ac2..88ddbe21b 100644
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -542,7 +542,6 @@ void begin_session(CitContext *con)
 #endif
 	}
 	con->cs_flags = 0;
-	con->upload_type = UPL_FILE;
 
 	con->nologin = 0;
 	if (((CtdlGetConfigInt("c_maxsessions") > 0)&&(num_sessions > CtdlGetConfigInt("c_maxsessions"))) || CtdlWantSingleUser()) {
diff --git a/citadel/context.h b/citadel/context.h
index dacac07a2..fd486caa3 100644
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -114,7 +114,6 @@ struct CitContext {
 	char upl_comment[256];
 	char upl_filedir[PATH_MAX];
 	char upl_mimetype[64];
-	char upload_type;
 
 	struct ctdluser user;	/* Database record buffers */
 	struct ctdlroom room;
diff --git a/citadel/modules/ctdlproto/serv_file.c b/citadel/modules/ctdlproto/serv_file.c
index 29b546056..936b46b8e 100644
--- a/citadel/modules/ctdlproto/serv_file.c
+++ b/citadel/modules/ctdlproto/serv_file.c
@@ -347,7 +347,6 @@ void cmd_uimg(char *cmdbuf)
 		return;
 	}
 	cprintf("%d Ok\n", CIT_OK);
-	CC->upload_type = UPL_IMAGE;
 }
 
 
diff --git a/citadel/server.h b/citadel/server.h
index c248691a6..572091636 100644
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -165,14 +165,6 @@ enum {
 };
 
 
-/*
- * Upload types
- */
-#define UPL_FILE	0
-#define UPL_NET		1
-#define UPL_IMAGE	2
-
-
 /*
  * message transfer formats
  */