protoize most functions #55

schwehr · 2023-01-07T00:18:36Z

Converts old style K & R function definitions to ANSI style.

Converts old style K & R function definitions to ANSI style.
Does not change any of the headers or local file prototypes.
Does not fix some varargs

The changes are generally of this form:

-xdrposix_putint(xdrs, lp)
-    XDR *xdrs;
-    int *lp;
+xdrposix_putint(XDR *xdrs, int *lp)

derobins · 2023-01-07T21:15:25Z

This is great. All K&R C in HDF4 should be converted to ANSI C.

derobins · 2023-01-07T22:00:15Z

Can this be fixed via clang format? We have another (draft) PR where we will implement that.

Hmm... It looks like clang format is profoundly confused by K&R C. I think we'll have to do this first (if we can't fix the script) and then implement standardized formatting.

schwehr · 2023-01-07T22:20:26Z

Can this be fixed via clang format? We have another (draft) PR where we will implement that.

Hmm... It looks like clang format is profoundly confused by K&R C. I think we'll have to do this first (if we can't fix the script) and then implement standardized formatting.

I don't think clang-format can. And gcc dropped protoize long ago.

https://invisible-island.net/cproto/cproto.html appears to be in debian testing. Haven't tried it yet.

apt-cache show cproto
Package: cproto
Version: 4.7u-1
Installed-Size: 122
Maintainer: Kenneth J. Pronovici <[email protected]>
Architecture: amd64
Depends: libc6 (>= 2.34), gcc
Description: utilities to generate C function prototypes from C source code
 Cproto is a program that generates function prototypes and variable
 declarations from C source code.  It can also convert function
 definitions between the old style and the ANSI C style.  This
 conversion overwrites the original files, so make a backup copy of
 your files in case something goes wrong.
Description-md5: fe74472d82a7bc4da41968b3563d1a85
Homepage: https://invisible-island.net/cproto/cproto.html
Filename: pool/cproto_4.7u-1_amd64_577d011b4aa7a9368b61b500dcb1e268153eda8611c1a3101f4e96424cd11db0.deb
Priority: optional
SHA256: 577d011b4aa7a9368b61b500dcb1e268153eda8611c1a3101f4e96424cd11db0
Section: devel
Size: 58210

schwehr · 2023-01-07T22:33:44Z

cproto will take some hacking to get working... I need to tell it where to find includes. But without that after doing to trickery:

cproto xdrposix.c 
/* xdrposix.c */
xdrposix.c:324: syntax error at token 'XDR'
Expected: {
xdrposix.c:326: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:347: syntax error at token 'XDR'
Expected: {
xdrposix.c:351: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:396: syntax error at token 'XDR'
Expected: {
xdrposix.c:397: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:422: syntax error at token 'XDR'
Expected: {
xdrposix.c:423: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:441: syntax error at token 'xdrposix_getlong'
Expected: ',' ';' '=' asm
xdrposix.c:444: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:459: syntax error at token 'xdrposix_putlong'
Expected: ',' ';' '=' asm
xdrposix.c:462: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:479: syntax error at token 'xdrposix_getbytes'
Expected: ',' ';' '=' asm
xdrposix.c:481: syntax error at token 'addr'
xdrposix.c:487: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:496: syntax error at token 'xdrposix_putbytes'
Expected: ',' ';' '=' asm
xdrposix.c:498: syntax error at token 'addr'
xdrposix.c:504: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:514: syntax error at token 'XDR'
Expected: {
xdrposix.c:515: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:522: syntax error at token 'xdrposix_setpos'
Expected: ',' ';' '=' asm
xdrposix.c:525: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:565: syntax error at token '*'
Expected: ',' ';' '=' asm
xdrposix.c:574: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:588: syntax error at token 'xdrposix_getint'
Expected: ',' ';' '=' asm
xdrposix.c:591: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:602: syntax error at token 'xdrposix_putint'
Expected: ',' ';' '=' asm
xdrposix.c:605: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:620: syntax error at token 'XDR'
Expected: {
xdrposix.c:621: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void
xdrposix.c:627: syntax error at token 'XDR'
Expected: {
xdrposix.c:630: syntax error at token '{'
Expected: "end of file" '&' '(' '*' ';' asm auto bool char complex ... void

schwehr · 2023-01-07T22:46:52Z

So -I works as expected.

cproto -I../../build-ninja -I../../hdf/src  -I../../build-ninja -I. xdrposix.c 
/* xdrposix.c */
In file included from xdrposix.c:29:
local_nc.h:57:15: fatal error: types.h: No such file or directory
   57 | #include      "types.h"  /* <types.h */
      |               ^~~~~~~~~

schwehr · 2023-01-08T02:55:13Z

Trying a bit more, I wasn't successful with cproto.

cproto -i -s -q -a -I../../build-ninja -I../../hdf/src  -I../../build-ninja -I../xdr  -I. xdrposix.c 

/* xdrposix.c */
/usr/include/sys/cdefs.h:591: bad character '0'
/usr/include/sys/cdefs.h:591: syntax error at token ','
Expected: '&' '(' ')' '*' [] auto bool char complex define-name double ... void
/usr/include/string.h:34: cannot read file <stddef.h>
/usr/include/string.h:44: syntax error at token 'size_t'
Expected: ... auto bool char complex define-name double enum extension ... void
/usr/include/string.h:44: bad character '1'
/usr/include/string.h:44: bad character '2'
/usr/include/string.h:47: syntax error at token 'size_t'
Expected: ... auto bool char complex define-name double enum extension ... void
/usr/include/string.h:48: bad character '1'
/usr/include/string.h:48: bad character '2'
...

schwehr · 2023-01-09T07:19:09Z

Have been skipping varargs stuff like in error handlers.

There are also these to make sure I get.

find . -name "*.[ch]" | xargs grep PROTOTYPE
./hdf/src/mfgrf.c:#ifdef PROTOTYPE
./hdf/src/mfgrf.c:#endif /* PROTOTYPE */
./hdf/src/mfgrf.c:#ifdef PROTOTYPE 
./hdf/src/mfgrf.c:#endif /* PROTOTYPE */

[SNIP]

./mfhdf/fortran/mfsdf.c:#ifdef PROTOTYPE
./mfhdf/fortran/mfsdf.c:#endif /* PROTOTYPE */
./mfhdf/ncgen/genlib.h:#ifndef NO_HAVE_PROTOTYPES 
./mfhdf/nctest/add.h:#ifndef NO_HAVE_PROTOTYPES 
./mfhdf/nctest/emalloc.h:#ifndef NO_HAVE_PROTOTYPES 
./mfhdf/nctest/driver.c:#ifdef PROTOTYPE
./mfhdf/nctest/val.h:#ifndef NO_HAVE_PROTOTYPES 
./mfhdf/nctest/error.h:#ifndef NO_HAVE_PROTOTYPES
./mfhdf/nctest/tests.h:#ifndef NO_HAVE_PROTOTYPES 
./mfhdf/ncdump/vardata.h:#ifndef NO_HAVE_PROTOTYPES 
./mfhdf/ncdump/dumplib.h:#ifndef NO_HAVE_PROTOTYPES 
./mfhdf/test/cdftest.c:#ifdef PROTOTYPE
./mfhdf/libsrc/local_nc.h:#define PROTOTYPE
./mfhdf/libsrc/local_nc.h:#ifndef NO_HAVE_PROTOTYPES

and

find . -name "*.[ch]" | xargs grep NO_STDARG 
./mfhdf/ncgen/genlib.h:#ifndef NO_STDARG
./mfhdf/ncgen/genlib.c:#ifndef NO_STDARG
./mfhdf/ncgen/genlib.c:#endif /* !NO_STDARG */
./mfhdf/ncgen/genlib.c:#ifndef NO_STDARG
./mfhdf/ncgen/genlib.c:#endif /* !NO_STDARG */
./mfhdf/ncgen/genlib.c:#ifndef NO_STDARG
./mfhdf/ncgen/genlib.c:#endif /* !NO_STDARG */
./mfhdf/nctest/error.c:#ifndef NO_STDARG
./mfhdf/nctest/error.c:#ifndef NO_STDARG
./mfhdf/nctest/error.c:#ifndef NO_STDARG
./mfhdf/nctest/error.h:#ifndef NO_STDARG
./mfhdf/ncdump/dumplib.c:#ifndef NO_STDARG
./mfhdf/ncdump/dumplib.c:#ifndef NO_STDARG
./mfhdf/ncdump/dumplib.c:#ifndef NO_STDARG
./mfhdf/ncdump/dumplib.h:#ifndef NO_STDARG
./mfhdf/libsrc/error.c:#ifdef NO_STDARG  /* The 4.0 release should be ANSI compliant */
./mfhdf/libsrc/error.c:#undef NO_STDARG
./mfhdf/libsrc/error.c:#ifndef NO_STDARG
./mfhdf/libsrc/error.c:#endif /* !NO_STDARG */
./mfhdf/libsrc/error.c:#ifndef NO_STDARG
./mfhdf/libsrc/error.c:#endif /* !NO_STDARG */
./mfhdf/libsrc/error.c:#ifndef NO_STDARG
./mfhdf/libsrc/error.c:#endif /* !NO_STDARG */
./mfhdf/libsrc/error.c:#ifndef NO_STDARG
./mfhdf/libsrc/error.c:#endif /* !NO_STDARG */
./mfhdf/libsrc/error.c:#ifndef NO_STDARG
./mfhdf/libsrc/error.c:#endif /* !NO_STDARG */
./mfhdf/libsrc/error.h:#ifndef NO_STDARG
./mfhdf/libsrc/error.h:#endif /* NO_STDARG */

- Converts old style K & R function definitions to ANSI style. - Does not change any of the headers or local file prototypes. - Does not fix some varargs

schwehr force-pushed the protoize branch from 4c52e77 to 6394a0a Compare January 10, 2023 07:04

protoize functions

bc03a15

- Converts old style K & R function definitions to ANSI style. - Does not change any of the headers or local file prototypes. - Does not fix some varargs

schwehr force-pushed the protoize branch from 6394a0a to bc03a15 Compare January 10, 2023 07:08

schwehr added 4 commits January 9, 2023 23:18

add.c del_att: Fix type for iatt arg

1f9dd3b

atttests.c test_ncattrename: Fix arg type

8a726eb

slabs.c: Fix typo

78ebc6f

rec.c: Remove old-style parameter declarations

7ee8eb9

schwehr changed the title ~~xdrposix.c: protoize functions~~ protoize most functions Jan 10, 2023

schwehr marked this pull request as ready for review January 10, 2023 07:36

schwehr requested review from lrknox, byrnHDF, bmribler and derobins as code owners January 10, 2023 07:36

derobins approved these changes Jan 10, 2023

View reviewed changes

derobins merged commit 0f574c2 into HDFGroup:master Jan 10, 2023

schwehr deleted the protoize branch January 10, 2023 16:47

schwehr mentioned this pull request Jan 10, 2023

Fix more C warnings #32

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

protoize most functions #55

protoize most functions #55

schwehr commented Jan 7, 2023 •

edited

Loading

derobins commented Jan 7, 2023

derobins commented Jan 7, 2023 •

edited

Loading

schwehr commented Jan 7, 2023

schwehr commented Jan 7, 2023

schwehr commented Jan 7, 2023

schwehr commented Jan 8, 2023

schwehr commented Jan 9, 2023 •

edited

Loading

protoize most functions #55

protoize most functions #55

Conversation

schwehr commented Jan 7, 2023 • edited Loading

derobins commented Jan 7, 2023

derobins commented Jan 7, 2023 • edited Loading

schwehr commented Jan 7, 2023

schwehr commented Jan 7, 2023

schwehr commented Jan 7, 2023

schwehr commented Jan 8, 2023

schwehr commented Jan 9, 2023 • edited Loading

schwehr commented Jan 7, 2023 •

edited

Loading

derobins commented Jan 7, 2023 •

edited

Loading

schwehr commented Jan 9, 2023 •

edited

Loading