Browse Source

Fix "cast from 'const char *' to 'char *' drops const qualifier"

Kevin Wojniak 9 năm trước cách đây
mục cha
commit
fe420072c4
2 tập tin đã thay đổi với 10 bổ sung10 xóa
  1. 6 6
      src/civetweb.c
  2. 4 4
      src/main.c

+ 6 - 6
src/civetweb.c

@@ -4142,7 +4142,7 @@ mg_write(struct mg_connection *conn, const void *buf, size_t len)
 		                      conn->ssl,
 		                      (const char *)buf,
 		                      (int64_t)allowed)) == allowed) {
-			buf = (char *)buf + total;
+			buf = (const char *)buf + total;
 			conn->last_throttle_bytes += total;
 			while (total < (int64_t)len && conn->ctx->stop_flag == 0) {
 				allowed = conn->throttle > (int64_t)len - total
@@ -4159,7 +4159,7 @@ mg_write(struct mg_connection *conn, const void *buf, size_t len)
 				sleep(1);
 				conn->last_throttle_bytes = allowed;
 				conn->last_throttle_time = time(NULL);
-				buf = (char *)buf + n;
+				buf = (const char *)buf + n;
 				total += n;
 			}
 		}
@@ -5296,19 +5296,19 @@ parse_auth_header(struct mg_connection *conn,
 }
 
 
-static char *
+static const char *
 mg_fgets(char *buf, size_t size, struct file *filep, char **p)
 {
-	char *eof;
+	const char *eof;
 	size_t len;
-	char *memend;
+	const char *memend;
 
 	if (!filep) {
 		return NULL;
 	}
 
 	if (filep->membuf != NULL && *p != NULL) {
-		memend = (char *)&filep->membuf[filep->size];
+		memend = (const char *)&filep->membuf[filep->size];
 		/* Search for \n from p till the end of stream */
 		eof = (char *)memchr(*p, '\n', (size_t)(memend - *p));
 		if (eof != NULL) {

+ 4 - 4
src/main.c

@@ -129,8 +129,8 @@ struct tuser_data {
 
 static int g_exit_flag = 0;         /* Main loop should exit */
 static char g_server_base_name[40]; /* Set by init_server_name() */
-static char *g_server_name;         /* Set by init_server_name() */
-static char *g_icon_name;           /* Set by init_server_name() */
+static const char *g_server_name;         /* Set by init_server_name() */
+static const char *g_icon_name;           /* Set by init_server_name() */
 static char g_config_file_name[PATH_MAX] =
     "";                          /* Set by process_command_line_arguments() */
 static struct mg_context *g_ctx; /* Set by start_civetweb() */
@@ -612,7 +612,7 @@ init_server_name(int argc, const char *argv[])
 		if ((argv[i][0] == '-')
 		    && (0 == strcmp(argv[i] + 1,
 		                    main_config_options[OPTION_TITLE].name))) {
-			g_server_name = (char *)(argv[i + 1]);
+			g_server_name = (const char *)(argv[i + 1]);
 		}
 	}
 	g_icon_name = NULL;
@@ -620,7 +620,7 @@ init_server_name(int argc, const char *argv[])
 		if ((argv[i][0] == '-')
 		    && (0 == strcmp(argv[i] + 1,
 		                    main_config_options[OPTION_ICON].name))) {
-			g_icon_name = (char *)(argv[i + 1]);
+			g_icon_name = (const char *)(argv[i + 1]);
 		}
 	}
 }