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

Fixes for GCC-14. handle_python_function defined with only one argume… #91

Closed
wants to merge 1 commit into from
Closed

Fixes for GCC-14. handle_python_function defined with only one argume… #91

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 src/expr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@ static Value *function_switch(const ExprFunc *func, int n, const char *parent)
#ifdef TFPYTHON
case FN_python:
{
struct Value *rv = handle_python_function( opdstr(n-0) );
struct Value *rv = handle_python_function( opdstr(n-0), 0 );
if( !rv ) {
return shareval(val_zero);
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/tfpython.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static struct Value* pyvar_to_tfvar( PyObject *pRc )
{
struct Value *rc;
char *cstr;
int len; // Py_ssize_t len;
long int len; // Py_ssize_t len;

// can be null if exception was thrown
if( !pRc ) {
Expand Down Expand Up @@ -466,7 +466,7 @@ struct Value *handle_python_command( String *args, int offset )
return pyvar_to_tfvar( pRc );
}

struct Value *handle_python_function( conString *args )
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really dont understand why we need that empty argument..

Whats the error without it?

Copy link
Author

@fierlo fierlo Nov 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ingwarsw

Looking back, it doesn't appear to have been needed. I think I tried to "fix" a compile error by changing something in expr.c first, when I only needed to address the one below in tfpython.c.

When compiling with GCC-14, I got this error:

tfpython.c: In function ‘pyvar_to_tfvar’:
tfpython.c:213:76: error: passing argument 3 of ‘PyBytes_AsStringAndSize’ from incompatible pointer type [-Wincompatible-pointer-types]
213 | if( PyBytes_Check( pRc ) && ( PyBytes_AsStringAndSize( pRc, &cstr, &len ) != -1 ) ) {
| ^~~~
| |
| int *
In file included from /usr/include/python3.12/Python.h:50,
from tfpython.h:6,
from tfpython.c:10:
/usr/include/python3.12/bytesobject.h:57:17: note: expected ‘Py_ssize_t *’ {aka ‘long int *’} but argument is of type ‘int *’
57 | Py_ssize_t len / pointer to length variable or NULL */

Changing int to long int on line 204 compiles without issue.

Like I said in the first one... I really don't know C at all, and was just trying to find something that would compile so that someone who knows better than me might be able to save a slight amount of time. :)

struct Value *handle_python_function( conString *args, int offset )
{
PyObject *pRc;

Expand Down
2 changes: 1 addition & 1 deletion src/tfpython.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "signals.h" /* suspend(), shell() */
#include "variable.h"

struct Value *handle_python_function( conString *args );
struct Value *handle_python_function( conString *args, int offset );
struct Value *handle_python_command( String *args, int offset );
struct Value *handle_python_kill_command( String *args, int offset );
struct Value *handle_python_call_command( String *args, int offset );
Expand Down
Loading