Skip to content

Commit

Permalink
Add 'const' qualifier to j9jit_printf and related functions
Browse files Browse the repository at this point in the history 
Fix string literal conversion warnings by adding 'const'
qualifiers to parameters of j9jit_printf and related functions

Signed-off-by: Dylan Tuttle <[email protected]>
  • Loading branch information
@dylanjtuttle
dylanjtuttle committed Nov 22, 2023
1 parent c748ee3 commit e5b672a
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
24 changes: 12 additions & 12 deletions runtime/compiler/env/VMJ9.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ typedef struct TR_JitPrivateConfig
TR_YesNoMaybe aotValidHeader;
void (*j9jitrt_lock_log)(void *voidConfig);
void (*j9jitrt_unlock_log)(void *voidConfig);
int (*j9jitrt_printf)(void *voidConfig, char *format, ...) ;
int (*j9jitrt_printf)(void *voidConfig, const char *format, ...) ;

// Runtime phase profiling buffer
//
Expand Down Expand Up @@ -164,31 +164,31 @@ extern "C" {

J9VMThread * getJ9VMThreadFromTR_VM(void * vm);
J9JITConfig * getJ9JitConfigFromFE(void *vm);
TR::FILE *j9jit_fopen(char *fileName, const char *mode, bool useJ9IO);
TR::FILE *j9jit_fopen(const char *fileName, const char *mode, bool useJ9IO);
void j9jit_fclose(TR::FILE *pFile);
void j9jit_seek(void *voidConfig, TR::FILE *pFile, IDATA offset, I_32 whence);
IDATA j9jit_read(void *voidConfig, TR::FILE *pFile, void *buf, IDATA nbytes);
void j9jit_fflush(TR::FILE *pFile);
void j9jit_lock_vlog(void *voidConfig);
void j9jit_unlock_vlog(void *voidConfig);
void j9jit_printf(void *voidConfig, char *format, ...);
I_32 j9jit_vprintf(void *voidConfig, char *format, va_list args);
I_32 j9jit_fprintf(TR::FILE *pFile, char *format, ...);
I_32 j9jit_vfprintf(TR::FILE *pFile, char *format, va_list args);
void j9jit_printf(void *voidConfig, const char *format, ...);
I_32 j9jit_vprintf(void *voidConfig, const char *format, va_list args);
I_32 j9jit_fprintf(TR::FILE *pFile, const char *format, ...);
I_32 j9jit_vfprintf(TR::FILE *pFile, const char *format, va_list args);

void j9jitrt_lock_log(void *voidConfig);
void j9jitrt_unlock_log(void *voidConfig);
I_32 j9jitrt_printf(void *voidConfig, char *format, ...);
I_32 j9jitrt_printf(void *voidConfig, const char *format, ...);

I_32 j9jit_fopenName(char *fileName);
I_32 j9jit_fopen_existing(char *fileName);
I_32 j9jit_fmove(char * pathExist, char * pathNew);
I_32 j9jit_fopenName(const char *fileName);
I_32 j9jit_fopen_existing(const char *fileName);
I_32 j9jit_fmove(const char * pathExist, const char * pathNew);
void j9jit_fcloseId(I_32 fileId);
I_32 j9jit_fread(I_32 fd, void * buf, IDATA nbytes);
I_32 j9jit_fseek(I_32 fd, I_32 whence);
I_64 j9jit_time_current_time_millis();
I_32 j9jit_vfprintfId(I_32 fileId, char *format, ...);
I_32 j9jit_fprintfId(I_32 fileId, char *format, ...);
I_32 j9jit_vfprintfId(I_32 fileId, const char *format, ...);
I_32 j9jit_fprintfId(I_32 fileId, const char *format, ...);

void jitHookClassLoadHelper(J9VMThread *vmThread,
J9JITConfig * jitConfig,
Expand Down
28 changes: 14 additions & 14 deletions runtime/compiler/env/jitsupport.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ I_32 j9jit_fread(I_32 fd, void * buf, IDATA nbytes)
}


I_32 j9jit_fmove(char * pathExist, char * pathNew)
I_32 j9jit_fmove(const char *pathExist, const char *pathNew)
{
PORT_ACCESS_FROM_PORT(TR::Compiler->portLib);
I_32 fileId;
Expand All @@ -93,7 +93,7 @@ I_32 j9jit_fmove(char * pathExist, char * pathNew)
}


I_32 j9jit_fopen_existing(char *fileName)
I_32 j9jit_fopen_existing(const char *fileName)
{
PORT_ACCESS_FROM_PORT(TR::Compiler->portLib);
I_32 fileId;
Expand All @@ -113,7 +113,7 @@ void j9jit_fcloseId(I_32 fileId)
}


I_32 j9jit_fopenName(char *fileName)
I_32 j9jit_fopenName(const char *fileName)
{
PORT_ACCESS_FROM_PORT(TR::Compiler->portLib);
I_32 fileId;
Expand All @@ -127,7 +127,7 @@ I_32 j9jit_fopenName(char *fileName)


TR::FILE *
j9jit_fopen(char *fileName, const char *mode, bool useJ9IO)
j9jit_fopen(const char *fileName, const char *mode, bool useJ9IO)
{
PORT_ACCESS_FROM_PORT(TR::Compiler->portLib);
TR::FILE *pFile;
Expand Down Expand Up @@ -232,7 +232,7 @@ void j9jitrt_unlock_log(void *voidConfig)
}


I_32 j9jit_vfprintfId(I_32 fileId, char *format, ...)
I_32 j9jit_vfprintfId(I_32 fileId, const char *format, ...)
{
PORT_ACCESS_FROM_PORT(TR::Compiler->portLib);
char buf[512];
Expand Down Expand Up @@ -264,7 +264,7 @@ I_32 j9jit_vfprintfId(I_32 fileId, char *format, ...)
}


I_32 j9jit_fprintfId(I_32 fileId, char *format, ...)
I_32 j9jit_fprintfId(I_32 fileId, const char *format, ...)
{
va_list args;
va_start(args, format);
Expand All @@ -274,7 +274,7 @@ I_32 j9jit_fprintfId(I_32 fileId, char *format, ...)
}


I_32 j9jit_vfprintf(TR::FILE *pFile, char *format, va_list args)
I_32 j9jit_vfprintf(TR::FILE *pFile, const char *format, va_list args)
{
PORT_ACCESS_FROM_PORT(TR::Compiler->portLib);
const int32_t BUFSIZE = 640;
Expand Down Expand Up @@ -324,7 +324,7 @@ I_32 j9jit_vfprintf(TR::FILE *pFile, char *format, va_list args)
}


I_32 j9jit_fprintf(TR::FILE *pFile, char *format, ...)
I_32 j9jit_fprintf(TR::FILE *pFile, const char *format, ...)
{
va_list args;
va_start(args, format);
Expand All @@ -334,13 +334,13 @@ I_32 j9jit_fprintf(TR::FILE *pFile, char *format, ...)
}


static I_32 vlog_vprintf(J9JITConfig *config, char *format, va_list args)
static I_32 vlog_vprintf(J9JITConfig *config, const char *format, va_list args)
{
return j9jit_vfprintf(((TR_JitPrivateConfig*)config->privateConfig)->vLogFile, format, args);
}


static I_32 vlog_printf(J9JITConfig *config, char *format, ...)
static I_32 vlog_printf(J9JITConfig *config, const char *format, ...)
{
va_list args;
va_start(args, format);
Expand All @@ -350,14 +350,14 @@ static I_32 vlog_printf(J9JITConfig *config, char *format, ...)
}


I_32 j9jit_vprintf(void *voidConfig, char *format, va_list args)
I_32 j9jit_vprintf(void *voidConfig, const char *format, va_list args)
{
J9JITConfig *config = (J9JITConfig *) voidConfig;
return vlog_vprintf(config, format, args);
}


void j9jit_printf(void *voidConfig, char *format, ...)
void j9jit_printf(void *voidConfig, const char *format, ...)
{
va_list args;
va_start(args, format);
Expand All @@ -366,13 +366,13 @@ void j9jit_printf(void *voidConfig, char *format, ...)
}


static I_32 rtlog_vprintf(J9JITConfig *config, char *format, va_list args)
static I_32 rtlog_vprintf(J9JITConfig *config, const char *format, va_list args)
{
return j9jit_vfprintf(((TR_JitPrivateConfig*)config->privateConfig)->rtLogFile, format, args);
}


I_32 j9jitrt_printf(void *voidConfig, char *format, ...)
I_32 j9jitrt_printf(void *voidConfig, const char *format, ...)
{
va_list args;
va_start(args, format);
Expand Down
2 changes: 1 addition & 1 deletion runtime/oti/j9nonbuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4055,7 +4055,7 @@ typedef struct J9JITConfig {
void ( *jitFlushCompilationQueue)(struct J9VMThread * currentThread, J9JITFlushCompilationQueueReason reason) ;
void ( *jitDecompileMethodForFramePop)(struct J9VMThread * currentThread, UDATA skipCount) ;
void ( *jitExceptionCaught)(struct J9VMThread * currentThread) ;
void ( *j9jit_printf)(void *voidConfig, char *format, ...) ;
void ( *j9jit_printf)(void *voidConfig, const char *format, ...) ;
void* tracingHook;
void ( *jitCheckScavengeOnResolve)(struct J9VMThread *currentThread) ;
void* jitInstanceOf;
Expand Down

0 comments on commit e5b672a

Please sign in to comment.