Skip to content

Commit

Permalink
ffs 2024-08-01 (ca70df06) (#4281)
Browse files Browse the repository at this point in the history
Code extracted from:

    https://github.com/GTkorvo/ffs.git

at commit ca70df069f89f78f71fd1129cce7036657b7b559 (master).

Upstream Shortlog
-----------------

Co-authored-by: ffs Upstream <robot@adios2>
  • Loading branch information
eisenhauer and ffs Upstream authored Aug 1, 2024
1 parent 117a1d5 commit ad7164b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 32 deletions.
2 changes: 1 addition & 1 deletion thirdparty/ffs/ffs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()

project(FFS VERSION 3.0.0)
project(FFS VERSION 3.1.1)

# Some boilerplate to setup nice output directories
include(GNUInstallDirs)
Expand Down
30 changes: 0 additions & 30 deletions thirdparty/ffs/ffs/cod/standard.c
Original file line number Diff line number Diff line change
Expand Up @@ -525,33 +525,6 @@ char *strtok(char *s1, const char *s2);\n\
int strxfrm(char *s1, const char *s2, int size);\n\
";

static cod_extern_entry strings_externs[] =
{
#ifndef _MSC_VER
{"bcmp", (void*)(intptr_t)bcmp},
{"bcopy", (void*)(intptr_t)bcopy},
{"bzero", (void*)(intptr_t)bzero},
{"index", (void*)(intptr_t)index},
{"rindex", (void*)(intptr_t)rindex},
{"ffs", (void*)(intptr_t)ffs},
{"strcasecmp", (void*)(intptr_t)strcasecmp},
{"strncasecmp", (void*)(intptr_t)strncasecmp},
#endif
{NULL, NULL}
};

static char strings_extern_string[] = "\n\
int bcmp(const void *m1, const void *m2, int size);\n\
void bcopy(const void *m1, void *m2, int size);\n\
void bzero(void *m, int size);\n\
char *index(const char *s1, int c);\n\
char *rindex(const char *s1, int c);\n\
int ffs(int);\n\
int strcasecmp(const char *s1, const char *s2);\n\
int strncasecmp(const char *s1, const char *s2, int size);\n\
";


#include <math.h>

static cod_extern_entry math_externs[] =
Expand Down Expand Up @@ -694,9 +667,6 @@ cod_process_include(char *name, cod_parse_context context)
if (strncmp(name, "string", char_count) == 0) {
cod_assoc_externs(context, string_externs);
cod_parse_for_context(string_extern_string, context);
} else if (strncmp(name, "strings", char_count) == 0) {
cod_assoc_externs(context, strings_externs);
cod_parse_for_context(strings_extern_string, context);
} else if (strncmp(name, "math", char_count) == 0) {
dlload_externs("libm", math_externs);
cod_assoc_externs(context, math_externs);
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/ffs/ffs/version.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <stdio.h>

static char *FFS_version = "FFS Version 3.0.0 - Sun May 14 17:04:30 EDT 2023\n";
static char *FFS_version = "FFS Version 3.1.1 - Thu Aug 1 06:18:53 CDT 2024\n";

void
FFSprint_version()
Expand Down

0 comments on commit ad7164b

Please sign in to comment.