Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

apps: Replace CONFIG_ARCH_HAVE_VFORK with CONFIG_ARCH_HAVE_FORK #1962

Merged
merged 1 commit into from
Nov 16, 2023
Merged

apps: Replace CONFIG_ARCH_HAVE_VFORK with CONFIG_ARCH_HAVE_FORK #1962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion interpreters/bas/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ config INTERPRETER_BAS_HAVE_FTRUNCATE
config EXAMPLES_BAS_SHELL
bool "Shell support"
default n
depends on ARCH_HAVE_VFORK && EXPERIMENTAL
depends on ARCH_HAVE_FORK && EXPERIMENTAL
select LIBC_EXECFUNCS
select SCHED_WAITPID
---help---
Expand Down
4 changes: 2 additions & 2 deletions interpreters/bas/bas_statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
* Public Functions
****************************************************************************/

struct Value *stmt_CALL(struct Value *value)

Check failure on line 53 in interpreters/bas/bas_statement.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found

Check failure on line 53 in interpreters/bas/bas_statement.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found

Check failure on line 53 in interpreters/bas/bas_statement.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
{
++g_pc.token;
if (g_pc.token->type != T_IDENTIFIER)
{
return Value_new_ERROR(value, MISSINGPROCIDENT);

Check failure on line 58 in interpreters/bas/bas_statement.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
}

if (g_pass == DECLARE)
Expand All @@ -66,35 +66,35 @@
}
else
{
Value_destroy(value);

Check failure on line 69 in interpreters/bas/bas_statement.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
}
}
else
{
if (g_pass == COMPILE)
{
if (Global_find

Check failure on line 76 in interpreters/bas/bas_statement.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
(&g_globals, g_pc.token->u.identifier,
(g_pc.token + 1)->type == T_OP) == 0)
{
return Value_new_ERROR(value, UNDECLARED);

Check failure on line 80 in interpreters/bas/bas_statement.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
}
}

if (g_pc.token->u.identifier->sym->type != USERFUNCTION &&
g_pc.token->u.identifier->sym->type != BUILTINFUNCTION)
{
return Value_new_ERROR(value, TYPEMISMATCH1, "variable",

Check failure on line 87 in interpreters/bas/bas_statement.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
"function");
}

func(value);
if (Value_retype(value, V_VOID)->type == V_ERROR)

Check failure on line 92 in interpreters/bas/bas_statement.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
{
return value;
}

Value_destroy(value);

Check failure on line 97 in interpreters/bas/bas_statement.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
}

return (struct Value *)0;
Expand Down Expand Up @@ -1051,7 +1051,7 @@

struct Value *stmt_EDIT(struct Value *value)
{
#if defined(CONFIG_EXAMPLES_BAS_EDITOR) && defined(CONFIG_EXAMPLES_BAS_SHELL) && defined(CONFIG_ARCH_HAVE_VFORK)
#if defined(CONFIG_EXAMPLES_BAS_EDITOR) && defined(CONFIG_EXAMPLES_BAS_SHELL) && defined(CONFIG_ARCH_HAVE_FORK)
long int line;
struct Pc statementpc = g_pc;
int status;
Expand Down Expand Up @@ -5674,7 +5674,7 @@

struct Value *stmt_SHELL(struct Value *value)
{
#if defined(CONFIG_EXAMPLES_BAS_SHELL) && defined(CONFIG_ARCH_HAVE_VFORK)
#if defined(CONFIG_EXAMPLES_BAS_SHELL) && defined(CONFIG_ARCH_HAVE_FORK)
pid_t pid;
int status;

Expand Down
2 changes: 1 addition & 1 deletion testing/ostest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ if(CONFIG_TESTING_OSTEST)
endif()
endif()

if(CONFIG_ARCH_HAVE_VFORK)
if(CONFIG_ARCH_HAVE_FORK)
if(CONFIG_SCHED_WAITPID)
list(APPEND SRCS vfork.c)
endif()
Expand Down
2 changes: 1 addition & 1 deletion testing/ostest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ CSRCS += sigev_thread.c
endif
endif

ifeq ($(CONFIG_ARCH_HAVE_VFORK),y)
ifeq ($(CONFIG_ARCH_HAVE_FORK),y)
ifeq ($(CONFIG_SCHED_WAITPID),y)
CSRCS += vfork.c
endif
Expand Down
2 changes: 1 addition & 1 deletion testing/ostest/ostest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ void sched_lock_test(void);

/* vfork.c ******************************************************************/

#if defined(CONFIG_ARCH_HAVE_VFORK) && defined(CONFIG_SCHED_WAITPID)
#if defined(CONFIG_ARCH_HAVE_FORK) && defined(CONFIG_SCHED_WAITPID)
int vfork_test(void);
#endif

Expand Down
2 changes: 1 addition & 1 deletion testing/ostest/ostest_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ static int user_main(int argc, char *argv[])
check_test_memory_usage();
#endif

#if defined(CONFIG_ARCH_HAVE_VFORK) && defined(CONFIG_SCHED_WAITPID)
#if defined(CONFIG_ARCH_HAVE_FORK) && defined(CONFIG_SCHED_WAITPID)
printf("\nuser_main: vfork() test\n");
vfork_test();
#endif
Expand Down
4 changes: 2 additions & 2 deletions testing/ostest/vfork.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#include "ostest.h"

#if defined(CONFIG_ARCH_HAVE_VFORK) && defined(CONFIG_SCHED_WAITPID)
#if defined(CONFIG_ARCH_HAVE_FORK) && defined(CONFIG_SCHED_WAITPID)

/****************************************************************************
* Private Data
Expand Down Expand Up @@ -84,4 +84,4 @@ int vfork_test(void)
return 0;
}

#endif /* CONFIG_ARCH_HAVE_VFORK && CONFIG_SCHED_WAITPID */
#endif /* CONFIG_ARCH_HAVE_FORK && CONFIG_SCHED_WAITPID */
Loading