Skip to content

Prevent warning C4273 for functions defined in libunshield.h #227

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

Open
ScaledLizard wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Prevent warning C4273 for functions defined in libunshield.h #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d4bdd3
Prevent warning C4273 for functions defined in libunshield.h: functio…
ScaledLizard Apr 2, 2026
fadbe60
Add two functions to retrieve more file data: unshield_file_size_comp…
ScaledLizard Apr 8, 2026
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
4 changes: 2 additions & 2 deletions lib/component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
#include <stdlib.h>
#include <string.h>

int unshield_component_count(Unshield* unshield)
UNSHIELD_API int unshield_component_count(Unshield* unshield)
{
Header* header = unshield->header_list;
return header->component_count;
}

const char* unshield_component_name(Unshield* unshield, int index)
UNSHIELD_API const char* unshield_component_name(Unshield* unshield, int index)
{
Header* header = unshield->header_list;

Expand Down
4 changes: 2 additions & 2 deletions lib/directory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "internal.h"
#include "log.h"

int unshield_directory_count(Unshield* unshield)
UNSHIELD_API int unshield_directory_count(Unshield* unshield)
{
if (unshield)
{
Expand All @@ -14,7 +14,7 @@ int unshield_directory_count(Unshield* unshield)
return -1;
}

const char* unshield_directory_name(Unshield* unshield, int index)
UNSHIELD_API const char* unshield_directory_name(Unshield* unshield, int index)
{
if (unshield && index >= 0)
{
Expand Down
36 changes: 27 additions & 9 deletions lib/file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static FileDescriptor* unshield_get_file_descriptor(Unshield* unshield, int inde
return header->file_descriptors[index];
}

int unshield_file_count (Unshield* unshield)/*{{{*/
UNSHIELD_API int unshield_file_count (Unshield* unshield)/*{{{*/
{
if (unshield)
{
Expand All @@ -176,7 +176,7 @@ int unshield_file_count (Unshield* unshield)/*{{{*/
return -1;
}/*}}}*/

const char* unshield_file_name (Unshield* unshield, int index)/*{{{*/
UNSHIELD_API const char* unshield_file_name (Unshield* unshield, int index)/*{{{*/
{
FileDescriptor* fd = unshield_get_file_descriptor(unshield, index);

Expand All @@ -196,7 +196,7 @@ const char* unshield_file_name (Unshield* unshield, int index)/*{{{*/
return NULL;
}/*}}}*/

bool unshield_file_is_valid(Unshield* unshield, int index)
UNSHIELD_API bool unshield_file_is_valid(Unshield* unshield, int index)
{
bool is_valid = false;
FileDescriptor* fd;
Expand Down Expand Up @@ -496,7 +496,7 @@ static bool unshield_reader_open_volume(UnshieldReader* reader, int volume)/*{{{
return success;
}/*}}}*/

void unshield_deobfuscate(unsigned char* buffer, size_t size, unsigned* seed)
UNSHIELD_API void unshield_deobfuscate(unsigned char* buffer, size_t size, unsigned* seed)
{
unsigned tmp_seed = *seed;

Expand Down Expand Up @@ -730,7 +730,7 @@ static void unshield_reader_destroy(UnshieldReader* reader)/*{{{*/
/*
* If filename is NULL, just throw away the result
*/
bool unshield_file_save (Unshield* unshield, int index, const char* filename)/*{{{*/
UNSHIELD_API bool unshield_file_save (Unshield* unshield, int index, const char* filename)/*{{{*/
{
bool success = false;
FILE* output = NULL;
Expand Down Expand Up @@ -932,7 +932,7 @@ bool unshield_file_save (Unshield* unshield, int index, const char* filename)/*{
return success;
}/*}}}*/

int unshield_file_directory(Unshield* unshield, int index)/*{{{*/
UNSHIELD_API int unshield_file_directory(Unshield* unshield, int index)/*{{{*/
{
FileDescriptor* fd = unshield_get_file_descriptor(unshield, index);
if (fd)
Expand All @@ -944,7 +944,7 @@ int unshield_file_directory(Unshield* unshield, int index)/*{{{*/
return -1;
}/*}}}*/

size_t unshield_file_size(Unshield* unshield, int index)/*{{{*/
UNSHIELD_API size_t unshield_file_size(Unshield* unshield, int index)/*{{{*/
{
FileDescriptor* fd = unshield_get_file_descriptor(unshield, index);
if (fd)
Expand All @@ -955,7 +955,25 @@ size_t unshield_file_size(Unshield* unshield, int index)/*{{{*/
return 0;
}/*}}}*/

bool unshield_file_save_raw(Unshield* unshield, int index, const char* filename)
UNSHIELD_API uint64_t unshield_file_size_compressed(Unshield* unshield, int index)/*{{{*/
{
FileDescriptor* fd = unshield_get_file_descriptor(unshield, index);
if (fd) {
return fd->compressed_size;
} else
return 0;
}/*}}}*/

UNSHIELD_API uint16_t unshield_file_flags_raw(Unshield* unshield, int index)/*{{{*/
{
FileDescriptor* fd = unshield_get_file_descriptor(unshield, index);
if (fd) {
return fd->flags;
} else
return 0;
}/*}}}*/

UNSHIELD_API bool unshield_file_save_raw(Unshield* unshield, int index, const char* filename)
{
/* XXX: Thou Shalt Not Cut & Paste... */
bool success = false;
Expand Down Expand Up @@ -1071,7 +1089,7 @@ static uint8_t* find_bytes(
return NULL;
}

bool unshield_file_save_old(Unshield* unshield, int index, const char* filename)/*{{{*/
UNSHIELD_API bool unshield_file_save_old(Unshield* unshield, int index, const char* filename)/*{{{*/
{
/* XXX: Thou Shalt Not Cut & Paste... */
bool success = false;
Expand Down
8 changes: 4 additions & 4 deletions lib/file_group.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ void unshield_file_group_destroy(UnshieldFileGroup* self)/*{{{*/
FREE(self);
}/*}}}*/

int unshield_file_group_count(Unshield* unshield)/*{{{*/
UNSHIELD_API int unshield_file_group_count(Unshield* unshield)/*{{{*/
{
Header* header = unshield->header_list;
return header->file_group_count;
}/*}}}*/

UnshieldFileGroup* unshield_file_group_get(Unshield* unshield, int index)
UNSHIELD_API UnshieldFileGroup* unshield_file_group_get(Unshield* unshield, int index)
{
Header* header = unshield->header_list;

Expand All @@ -53,7 +53,7 @@ UnshieldFileGroup* unshield_file_group_get(Unshield* unshield, int index)
return NULL;
}

UnshieldFileGroup* unshield_file_group_find(Unshield* unshield, const char* name)
UNSHIELD_API UnshieldFileGroup* unshield_file_group_find(Unshield* unshield, const char* name)
{
Header* header = unshield->header_list;
int i;
Expand All @@ -67,7 +67,7 @@ UnshieldFileGroup* unshield_file_group_find(Unshield* unshield, const char* name
return NULL;
}

const char* unshield_file_group_name(Unshield* unshield, int index)/*{{{*/
UNSHIELD_API const char* unshield_file_group_name(Unshield* unshield, int index)/*{{{*/
{
Header* header = unshield->header_list;

Expand Down
12 changes: 6 additions & 6 deletions lib/libunshield.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,22 +415,22 @@ static bool unshield_read_headers(Unshield* unshield, int version)/*{{{*/
return (unshield->header_list != NULL);
}/*}}}*/

Unshield* unshield_open(const char* filename)/*{{{*/
UNSHIELD_API Unshield* unshield_open(const char* filename)/*{{{*/
{
return unshield_open_force_version(filename, -1);
}/*}}}*/

Unshield* unshield_open_force_version(const char* filename, int version)/*{{{*/
UNSHIELD_API Unshield* unshield_open_force_version(const char* filename, int version)/*{{{*/
{
return unshield_open2_force_version(filename, version, NULL, NULL);
}/*}}}*/

Unshield* unshield_open2(const char* filename, const UnshieldIoCallbacks* callbacks, void* userdata)/*{{{*/
UNSHIELD_API Unshield* unshield_open2(const char* filename, const UnshieldIoCallbacks* callbacks, void* userdata)/*{{{*/
{
return unshield_open2_force_version(filename, -1, callbacks, userdata);
}/*}}}*/

Unshield* unshield_open2_force_version(const char* filename, int version, const UnshieldIoCallbacks* callbacks, void* userdata)/*{{{*/
UNSHIELD_API Unshield* unshield_open2_force_version(const char* filename, int version, const UnshieldIoCallbacks* callbacks, void* userdata)/*{{{*/
{
Unshield* unshield = NEW1(Unshield);
if (!unshield)
Expand Down Expand Up @@ -476,7 +476,7 @@ static void unshield_free_string_buffers(Header* header)
}
}

void unshield_close(Unshield* unshield)/*{{{*/
UNSHIELD_API void unshield_close(Unshield* unshield)/*{{{*/
{
if (unshield)
{
Expand Down Expand Up @@ -523,7 +523,7 @@ void unshield_close(Unshield* unshield)/*{{{*/
}
}/*}}}*/

bool unshield_is_unicode(Unshield* unshield)
UNSHIELD_API bool unshield_is_unicode(Unshield* unshield)
{
if (unshield)
{
Expand Down
3 changes: 3 additions & 0 deletions lib/libunshield.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>

#define UNSHIELD_LOG_LEVEL_LOWEST 0

Expand Down Expand Up @@ -117,6 +118,8 @@ UNSHIELD_API bool unshield_file_is_valid (Unshield* unshield, int in
UNSHIELD_API bool unshield_file_save (Unshield* unshield, int index, const char* filename);
UNSHIELD_API int unshield_file_directory (Unshield* unshield, int index);
UNSHIELD_API size_t unshield_file_size (Unshield* unshield, int index);
UNSHIELD_API uint64_t unshield_file_size_compressed(Unshield* unshield, int index);
UNSHIELD_API uint16_t unshield_file_flags_raw (Unshield* unshield, int index);

/** For investigation of compressed data */
UNSHIELD_API bool unshield_file_save_raw(Unshield* unshield, int index, const char* filename);
Expand Down
3 changes: 2 additions & 1 deletion lib/log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#include "internal.h"
#include "log.h"
#include <stdarg.h>
#include <stdio.h>

/* evil static data */
static int current_log_level = UNSHIELD_LOG_LEVEL_HIGHEST;

void unshield_set_log_level(int level)
UNSHIELD_API void unshield_set_log_level(int level)
{
current_log_level = level;
}
Expand Down
Loading