Skip to content

Commit

Permalink
Fix minor C compiler warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Antonin Décimo <[email protected]>
  • Loading branch information
MisterDA committed Jan 16, 2024
1 parent aefb885 commit d952ca9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
14 changes: 8 additions & 6 deletions flexdll.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,16 +244,15 @@ static void dump_master_reloctbl(reloctbl **ptr) {
/* Avoid the use of snprintf */
static void cannot_resolve_msg(char *name, err_t *err) {
static char msg[] = "Cannot resolve ";
static int l = sizeof(msg) - 1;
int n = strlen(name);
static size_t l = sizeof(msg) - 1;
size_t n = strlen(name);
memcpy(err->message,msg,l);
memcpy(err->message+l,name,min(n,sizeof(err->message) - l - 1));
err->message[l+n] = 0;
}

static void relocate(resolver f, void *data, reloctbl *tbl, err_t *err) {
reloc_entry *ptr;
nonwr *wr;
INT_PTR s;
DWORD prev_protect;
static long int page_size = 0;
Expand Down Expand Up @@ -379,13 +378,15 @@ static void relocate_master(resolver f, void *data, reloctbl **ptr, err_t *err)

static void dump_symtbl(symtbl *tbl)
{
int i;
UINT_PTR i;

if (!tbl) { printf("No symbol table\n"); return; }
printf("Dynamic symbol at %p (size = %u)\n", tbl, (unsigned int) tbl->size); fflush(stdout);

for (i = 0; i < tbl->size; i++) {
printf("[%i] ", i); fflush(stdout);
char buf[sizeof("18446744073709551616")] = { 0 };
_ui64toa_s(i, buf, sizeof(buf), 10);
printf("[%s] ", buf); fflush(stdout);
printf(" %p: ", tbl->entries[i].addr); fflush(stdout);
printf("%s\n", tbl->entries[i].name);
fflush(stdout);
Expand Down Expand Up @@ -434,6 +435,7 @@ static void unlink_unit(dlunit *unit) {
static void *find_symbol_global(void *data, const char *name) {
void *sym;
dlunit *unit;
(void)data;

if (!name) return NULL;
sym = find_symbol(&static_symtable, name);
Expand Down Expand Up @@ -566,7 +568,7 @@ void *flexdll_dlsym(void *u, const char *name) {
else return find_symbol(((dlunit*)u)->symtbl,name);
}

char *flexdll_dlerror() {
char *flexdll_dlerror(void) {
err_t * err;
err = get_tls_error(TLS_ERROR_NOP);
if(err == NULL) return TLS_ACCESS_ERRMSG;
Expand Down
1 change: 0 additions & 1 deletion test/dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ void api2(char *msg){ printf("API2: %s\n", msg); }

int main(int argc, char **argv)
{
void *sym;
void *handle;
int i;
torun *torun;
Expand Down

0 comments on commit d952ca9

Please sign in to comment.