Examples and test: use new instead of legacy interface

examples/embedded_c/embedded_c.c

@@ -236,9 +236,9 @@ field_found(const char *key,
 #else
 		snprintf(path, pathlen, "/tmp/%s", filename);
 #endif
-		return FORM_FIELD_STORAGE_STORE;
+		return MG_FORM_FIELD_STORAGE_STORE;
 	}
-	return FORM_FIELD_STORAGE_GET;
+	return MG_FORM_FIELD_STORAGE_GET;
 }
 
 
@@ -354,9 +354,9 @@ field_disp_read_on_the_fly(const char *key,
 		context->file[context->index - 1].name[127] = 0;
 		context->file[context->index - 1].length = 0;
 		md5_init(&(context->file[context->index - 1].chksum));
-		return FORM_FIELD_STORAGE_GET;
+		return MG_FORM_FIELD_STORAGE_GET;
 	}
-	return FORM_FIELD_STORAGE_ABORT;
+	return MG_FORM_FIELD_STORAGE_ABORT;
 }
 
 
@@ -699,7 +699,7 @@ WebSocketReadyHandler(struct mg_connection *conn, void *cbdata)
 	const char *text = "Hello from the websocket ready handler";
 	struct t_ws_client *client = mg_get_user_connection_data(conn);
 
-	mg_websocket_write(conn, WEBSOCKET_OPCODE_TEXT, text, strlen(text));
+	mg_websocket_write(conn, MG_WEBSOCKET_OPCODE_TEXT, text, strlen(text));
 	fprintf(stdout, "Greeting message sent to websocket client\r\n\r\n");
 	ASSERT(client->conn == conn);
 	ASSERT(client->state == 1);
@@ -721,22 +721,22 @@ WebsocketDataHandler(struct mg_connection *conn,
 
 	fprintf(stdout, "Websocket got %lu bytes of ", (unsigned long)len);
 	switch (((unsigned char)bits) & 0x0F) {
-	case WEBSOCKET_OPCODE_CONTINUATION:
+	case MG_WEBSOCKET_OPCODE_CONTINUATION:
 		fprintf(stdout, "continuation");
 		break;
-	case WEBSOCKET_OPCODE_TEXT:
+	case MG_WEBSOCKET_OPCODE_TEXT:
 		fprintf(stdout, "text");
 		break;
-	case WEBSOCKET_OPCODE_BINARY:
+	case MG_WEBSOCKET_OPCODE_BINARY:
 		fprintf(stdout, "binary");
 		break;
-	case WEBSOCKET_OPCODE_CONNECTION_CLOSE:
+	case MG_WEBSOCKET_OPCODE_CONNECTION_CLOSE:
 		fprintf(stdout, "close");
 		break;
-	case WEBSOCKET_OPCODE_PING:
+	case MG_WEBSOCKET_OPCODE_PING:
 		fprintf(stdout, "ping");
 		break;
-	case WEBSOCKET_OPCODE_PONG:
+	case MG_WEBSOCKET_OPCODE_PONG:
 		fprintf(stdout, "pong");
 		break;
 	default:
@@ -782,7 +782,7 @@ InformWebsockets(struct mg_context *ctx)
 	for (i = 0; i < MAX_WS_CLIENTS; i++) {
 		if (ws_clients[i].state == 2) {
 			mg_websocket_write(ws_clients[i].conn,
-			                   WEBSOCKET_OPCODE_TEXT,
+			                   MG_WEBSOCKET_OPCODE_TEXT,
 			                   text,
 			                   strlen(text));
 		}

src/civetweb.c

@@ -13619,7 +13619,8 @@ set_uid_option(struct mg_context *ctx)
 		const struct passwd *to_pw = NULL;
 
 		if (run_as_user != NULL && (to_pw = getpwnam(run_as_user)) == NULL) {
-			/* run_as_user does not exist on the system. We can't proceed further. */
+			/* run_as_user does not exist on the system. We can't proceed
+			 * further. */
 			mg_cry(fc(ctx), "%s: unknown user [%s]", __func__, run_as_user);
 		} else if (run_as_user == NULL || curr_uid == to_pw->pw_uid) {
 			/* There was either no request to change user, or we're already

test/public_server.c

@@ -2085,21 +2085,21 @@ field_found(const char *key,
 	ck_assert_uint_gt(pathlen, 128);
 	ck_assert_ptr_eq(user_data, (void *)&g_field_found_return);
 
-	ck_assert((g_field_found_return == FORM_FIELD_STORAGE_GET)
-	          || (g_field_found_return == FORM_FIELD_STORAGE_STORE)
-	          || (g_field_found_return == FORM_FIELD_STORAGE_SKIP)
-	          || (g_field_found_return == FORM_FIELD_STORAGE_ABORT));
+	ck_assert((g_field_found_return == MG_FORM_FIELD_STORAGE_GET)
+	          || (g_field_found_return == MG_FORM_FIELD_STORAGE_STORE)
+	          || (g_field_found_return == MG_FORM_FIELD_STORAGE_SKIP)
+	          || (g_field_found_return == MG_FORM_FIELD_STORAGE_ABORT));
 
 	ck_assert_str_ne(key, "dontread");
 
 	if (!strcmp(key, "break_field_handler")) {
-		return FORM_FIELD_STORAGE_ABORT;
+		return MG_FORM_FIELD_STORAGE_ABORT;
 	}
 	if (!strcmp(key, "continue_field_handler")) {
-		return FORM_FIELD_STORAGE_SKIP;
+		return MG_FORM_FIELD_STORAGE_SKIP;
 	}
 
-	if (g_field_found_return == FORM_FIELD_STORAGE_STORE) {
+	if (g_field_found_return == MG_FORM_FIELD_STORAGE_STORE) {
 		strncpy(path, key, pathlen - 8);
 		strcat(path, ".txt");
 	}
@@ -2327,7 +2327,7 @@ FormGet(struct mg_connection *conn, void *cbdata)
 
 	/* Call the form handler */
 	g_field_step = 0;
-	g_field_found_return = FORM_FIELD_STORAGE_GET;
+	g_field_found_return = MG_FORM_FIELD_STORAGE_GET;
 	ret = mg_handle_form_request(conn, &fdh);
 	g_field_found_return = -888;
 	ck_assert_int_eq(ret, 22);
@@ -2363,7 +2363,7 @@ FormStore(struct mg_connection *conn,
 
 	/* Call the form handler */
 	g_field_step = 100;
-	g_field_found_return = FORM_FIELD_STORAGE_STORE;
+	g_field_found_return = MG_FORM_FIELD_STORAGE_STORE;
 	ret = mg_handle_form_request(conn, &fdh);
 	ck_assert_int_eq(ret, ret_expected);
 	ck_assert_int_eq(g_field_step, field_step_expected);