]>
granicus.if.org Git - graphviz/log
Matthew Fernandez [Thu, 14 Oct 2021 03:03:09 +0000 (20:03 -0700)]
smyrna: remove unused 'frame_length' field
Matthew Fernandez [Thu, 14 Oct 2021 02:58:36 +0000 (19:58 -0700)]
smyrna: remove unused 'dfltEngine' field
Matthew Fernandez [Thu, 14 Oct 2021 02:58:01 +0000 (19:58 -0700)]
smyrna: remove unused 'consoleText' field
Matthew Fernandez [Thu, 14 Oct 2021 02:57:35 +0000 (19:57 -0700)]
smyrna: remove unused 'FontSizeConst' field
Matthew Fernandez [Thu, 14 Oct 2021 02:55:48 +0000 (19:55 -0700)]
smyrna: remove unused 'visiblenodecount' field
Matthew Fernandez [Thu, 14 Oct 2021 02:54:34 +0000 (19:54 -0700)]
smyrna: remove unused 'glade_file' field
Matthew Fernandez [Thu, 14 Oct 2021 02:53:28 +0000 (19:53 -0700)]
smyrna: remove unused 'attr_file' field
Matthew Fernandez [Thu, 14 Oct 2021 02:52:40 +0000 (19:52 -0700)]
smyrna: remove unused 'flush' field
Matthew Fernandez [Thu, 14 Oct 2021 02:52:00 +0000 (19:52 -0700)]
smyrna: remove unused 'scripts' array field
Matthew Fernandez [Thu, 14 Oct 2021 02:49:15 +0000 (19:49 -0700)]
smyrna: remove unused 'nodeshape' field and 'node_shape' type
The member `nodshapedot` also seems to have been misspelled, but never used
anyway, so oh well.
Matthew Fernandez [Thu, 14 Oct 2021 02:48:41 +0000 (19:48 -0700)]
smyrna: remove unused 'nodesizewithdegree' field
Matthew Fernandez [Wed, 20 Oct 2021 15:15:48 +0000 (15:15 +0000)]
Merge branch 'smattr/
2F81BBCF -85DE-4DC9-B683-
3F4784A7DD77 ' into 'main'
lib/cgraph: replace header guards with more modern #pragma once
See merge request graphviz/graphviz!2235
Matthew Fernandez [Sun, 17 Oct 2021 18:55:59 +0000 (11:55 -0700)]
lib/cgraph: replace header guards with more modern #pragma once
Matthew Fernandez [Wed, 20 Oct 2021 02:37:57 +0000 (02:37 +0000)]
Merge branch 'smattr/
A172EA51 -A44B-4BCE-9390-
72176966B563 ' into 'main'
more header guard replacement with #pragma once
See merge request graphviz/graphviz!2232
Matthew Fernandez [Sun, 17 Oct 2021 01:28:38 +0000 (18:28 -0700)]
lib/glcomp: replace header guards with more modern #pragma once
Amusingly it looks like some time in the past (prior to version control) someone
got a little trigger happy find-and-replacing “CompText” with “CompFont”.
Matthew Fernandez [Sun, 17 Oct 2021 01:16:17 +0000 (18:16 -0700)]
lib/xdot: replace header guards with more modern #pragma once
Matthew Fernandez [Sun, 17 Oct 2021 01:15:24 +0000 (18:15 -0700)]
lib/twopigen: replace header guards with more modern #pragma once
Matthew Fernandez [Wed, 20 Oct 2021 01:03:00 +0000 (01:03 +0000)]
Merge branch 'smattr/
E696CB4B -4EC4-479D-8073-
C970EEF14ECC ' into 'main'
CMake: only pass 'YY_NO_UNISTD_H' to Flex when unistd.h is not found
See merge request graphviz/graphviz!2229
Matthew Fernandez [Sat, 16 Oct 2021 21:19:41 +0000 (14:19 -0700)]
CMake: only pass 'YY_NO_UNISTD_H' to Flex when unistd.h is not found
This macro tells Flex that #including unistd.h should be avoided. There is no
need for this on almost any platform except Windows, hence why `YY_NO_UNISTD_H`
is only mentioned elsewhere in the MS Build build system, not in the Autotools
build system. In the CMake build system which is meant to be used across Windows
and non-Windows platforms, we can do something more nuanced and depend on the
existence check of unistd.h itself.
Matthew Fernandez [Tue, 19 Oct 2021 15:48:24 +0000 (15:48 +0000)]
Merge branch 'smattr/
1737da18 -1462-4672-ae09-
c19621653f51 ' into 'main'
fix GVPR splitting and tokenization bug
Closes #2138
See merge request graphviz/graphviz!2228
Matthew Fernandez [Sat, 16 Oct 2021 20:52:57 +0000 (13:52 -0700)]
extokens: fix missing NUL terminator append in GVPR tokenization
This is the second half of a bug fix following the prior commit.
Commit
971293551421455a0d939b9f8cea17356b7968f8 refactored this code to avoid
the use of an SFIO buffer, inadvertently introducing a bug. The change did not
account for the source buffer not being NUL terminated. This fix wicks closer to
the original code, not assuming a NUL terminator and copying a known number of
bytes into the destination.
Fixes #2138.
Matthew Fernandez [Sat, 16 Oct 2021 20:49:40 +0000 (13:49 -0700)]
exsplit: fix missing NUL terminator append in GVPR splitting
Commit
7ef9d53e2e6dc53c44939ace7a9cad57c3aa00bf refactored this code to avoid
the use of an SFIO buffer, inadvertently introducing a bug. The change did not
account for the source buffer not being NUL terminated. This fix wicks closer to
the original code, not assuming a NUL terminator and copying a known number of
bytes into the destination.
Related to #2138.
Matthew Fernandez [Sat, 16 Oct 2021 20:23:31 +0000 (13:23 -0700)]
add a test case for a GVPR bug
Related to #2138.
Matthew Fernandez [Sun, 17 Oct 2021 18:32:52 +0000 (18:32 +0000)]
Merge branch 'Warray-param' into 'main'
Match function signature in definition with declaration
See merge request graphviz/graphviz!2233
Nehal J Wani [Sun, 17 Oct 2021 03:10:30 +0000 (23:10 -0400)]
Match function signature in definition with declaration
GCC11 throws the following warning:
graphviz/lib/pathplan/shortest.c:93:47: warning: argument 2 of type ‘Ppoint_t *’ {aka ‘struct Pxy_t *’} declared as a pointer [-Warray-parameter=]
93 | int Pshortestpath(Ppoly_t * polyp, Ppoint_t * eps, Ppolyline_t * output)
| ~~~~~~~~~~~^~~
In file included from graphviz/lib/pathplan/pathutil.h:15,
from graphviz/lib/pathplan/shortest.c:16:
graphviz/lib/pathplan/pathplan.h:22:59: note: previously declared as an array ‘Ppoint_t[2]’ {aka ‘struct Pxy_t[2]’}
22 | extern int Pshortestpath(Ppoly_t * boundary, Ppoint_t endpoints[2],
| ~~~~~~~~~^~~~~~~~~~~~
[2/20] Building C object lib/pathplan/CMakeFiles/pathplan.dir/route.c.o
graphviz/lib/pathplan/route.c:76:29: warning: argument 4 of type ‘Ppoint_t *’ {aka ‘struct Pxy_t *’} declared as a pointer [-Warray-parameter=]
76 | Ppoint_t * evs, Ppolyline_t * output)
| ~~~~~~~~~~~^~~
In file included from graphviz/lib/pathplan/pathutil.h:15,
from graphviz/lib/pathplan/route.c:17:
graphviz/lib/pathplan/pathplan.h:28:39: note: previously declared as an array ‘Pvector_t[2]’ {aka ‘struct Pxy_t[2]’}
28 | Pvector_t endpoint_slopes[2],
| ~~~~~~~~~~^~~~~~~~~~~~~~~~~~
Matthew Fernandez [Sat, 16 Oct 2021 23:38:40 +0000 (23:38 +0000)]
Merge branch 'mingw64_cleanup_ifdef_gts' into 'main'
Unify usage of preprocessor constant HAVE_GTS.
See merge request graphviz/graphviz!2219
Matthew Fernandez [Sat, 16 Oct 2021 22:56:27 +0000 (15:56 -0700)]
realign a 'HAVE_GTS' check with 'ifdef' style
Primhill Computers [Mon, 11 Oct 2021 20:51:52 +0000 (21:51 +0100)]
Unify usage of preprocessor constant HAVE_GTS.
Matthew Fernandez [Sat, 16 Oct 2021 21:54:42 +0000 (21:54 +0000)]
Merge branch 'smattr/
264284AF -9FAA-4FDC-9985-
6158D1454C97 ' into 'main'
plugin/: replace header guards with more modern #pragma once
See merge request graphviz/graphviz!2225
Matthew Fernandez [Fri, 15 Oct 2021 00:07:38 +0000 (17:07 -0700)]
plugin/: replace header guards with more modern #pragma once
Matthew Fernandez [Sat, 16 Oct 2021 19:18:25 +0000 (19:18 +0000)]
Merge branch 'smattr/
652F0EAF -FDBE-4189-83D8-
EE850C97868C ' into 'main'
lib/neatogen/delaunay.c: some clean up
See merge request graphviz/graphviz!2226
Matthew Fernandez [Fri, 15 Oct 2021 15:13:52 +0000 (08:13 -0700)]
UG_graph: use a C99 bool for 'removed'
Matthew Fernandez [Fri, 15 Oct 2021 15:12:07 +0000 (08:12 -0700)]
delaunay.c: remove some unnecessary brackets
Matthew Fernandez [Fri, 15 Oct 2021 15:11:44 +0000 (08:11 -0700)]
delaunay.c: reflow some unnecessarily wrapped lines
Matthew Fernandez [Fri, 15 Oct 2021 15:05:26 +0000 (08:05 -0700)]
delaunay.c: remove some unnecessary casts
Matthew Fernandez [Fri, 15 Oct 2021 00:18:06 +0000 (17:18 -0700)]
update legacy 'qsort_r' comment
The problem of “call `qsort` but also access some external context” is still
relevant, but this functionality has been standardized into `qsort_s` in C11,
not `qsort_r`.
Matthew Fernandez [Sat, 16 Oct 2021 18:17:51 +0000 (18:17 +0000)]
Merge branch 'smattr/
0A848998 -1291-43E8-8525-
5A355EC8AD10 ' into 'main'
Move back to 2.49 development series
See merge request graphviz/graphviz!2227
Matthew Fernandez [Sat, 16 Oct 2021 15:40:49 +0000 (08:40 -0700)]
Move back to 2.49 development series
Matthew Fernandez [Sat, 16 Oct 2021 16:39:12 +0000 (16:39 +0000)]
Merge branch 'smattr/
AB9C539E -363F-4BFC-89A2-
4C432B9E7190 ' into 'main'
Stable Release 2.49.2
See merge request graphviz/graphviz!2218
Matthew Fernandez [Sun, 10 Oct 2021 21:38:37 +0000 (14:38 -0700)]
Stable Release 2.49.2
Matthew Fernandez [Sat, 16 Oct 2021 01:33:41 +0000 (01:33 +0000)]
Merge branch 'smattr/
238e3b6b -eb20-441a-a609-
79496e66c3e0 ' into 'main'
gv2gxl: remove duplicate XML escaping functionality
See merge request graphviz/graphviz!2208
Matthew Fernandez [Sat, 16 Oct 2021 01:33:40 +0000 (01:33 +0000)]
gv2gxl: remove duplicate XML escaping functionality
Matthew Fernandez [Fri, 15 Oct 2021 15:48:31 +0000 (15:48 +0000)]
Merge branch 'smattr/
93788a5c -6268-4813-8ab7-
7bf81636d537 ' into 'main'
sfio and expr warning squashing
See merge request graphviz/graphviz!2209
Matthew Fernandez [Sat, 9 Oct 2021 19:22:08 +0000 (12:22 -0700)]
SF_UNBOUND: define as a 'size_t' instead of casting to 'size_t' at every usage
There were also cases missing a cast, which triggered -Wsign-conversion
warnings.
Matthew Fernandez [Sat, 9 Oct 2021 19:16:47 +0000 (12:16 -0700)]
print: squash a -Wsign-compare warning
Matthew Fernandez [Sat, 9 Oct 2021 19:14:53 +0000 (12:14 -0700)]
print: remove variable shadowing of 'expr' global
Matthew Fernandez [Sat, 9 Oct 2021 19:13:42 +0000 (12:13 -0700)]
prints: remove variable shadowing of 'expr' global
Matthew Fernandez [Sat, 9 Oct 2021 19:11:37 +0000 (12:11 -0700)]
getdyn: remove variable shadowing of 'expr' global
Matthew Fernandez [Sat, 9 Oct 2021 19:09:26 +0000 (12:09 -0700)]
evaldyn: remove variable shadowing of 'expr' global
Matthew Fernandez [Sat, 9 Oct 2021 19:05:37 +0000 (12:05 -0700)]
exerror/exwarn: allow GNU-compatible compilers to detect misuse
This lets compilers like GCC and Clang notice when these functions are called
with a format string that is inconsistent with the remaining arguments and issue
a warning. This detects problems like those fixed in the prior commit.
Matthew Fernandez [Sat, 9 Oct 2021 19:01:21 +0000 (12:01 -0700)]
fix misuse of 'exerror'
These issues are detectable by tagging `exerror` with
`__attribute__((format(printf, 1, 2)))`.
Matthew Fernandez [Sat, 9 Oct 2021 18:40:39 +0000 (11:40 -0700)]
deref: remove unnecessary 'break' statements
Matthew Fernandez [Thu, 14 Oct 2021 16:25:38 +0000 (16:25 +0000)]
Merge branch 'smattr/
63959121 -2587-4D2B-82E1-
87E5132AC015 ' into 'main'
lib/cdt: replace header guards with more modern #pragma once
See merge request graphviz/graphviz!2224
Matthew Fernandez [Thu, 14 Oct 2021 03:50:07 +0000 (20:50 -0700)]
lib/cdt: replace header guards with more modern #pragma once
Matthew Fernandez [Thu, 14 Oct 2021 15:22:47 +0000 (15:22 +0000)]
Merge branch 'smattr/
CA6A6F72 -A9FA-4694-9BE4-
52D0EA99C11E ' into 'main'
lib/gvpr: replace header guards with more modern #pragma once
See merge request graphviz/graphviz!2220
Matthew Fernandez [Tue, 12 Oct 2021 00:13:08 +0000 (17:13 -0700)]
lib/gvpr: replace header guards with more modern #pragma once
Matthew Fernandez [Thu, 14 Oct 2021 03:45:09 +0000 (03:45 +0000)]
Merge branch 'smattr/
BD47AC77 -0B88-41A8-8983-
2D057C6598C7 ' into 'main'
libedgepaint: replace header guards with more modern #pragma once
See merge request graphviz/graphviz!2215
Matthew Fernandez [Sun, 10 Oct 2021 19:10:31 +0000 (12:10 -0700)]
libedgepaint: replace header guards with more modern #pragma once
Matthew Fernandez [Thu, 14 Oct 2021 02:41:50 +0000 (02:41 +0000)]
Merge branch 'smattr/
527996E1 -267D-4746-BF2A-
20A2A66E028B ' into 'main'
lib/ast: replace header guards with more modern #pragma once
See merge request graphviz/graphviz!2222
Matthew Fernandez [Wed, 13 Oct 2021 01:15:49 +0000 (18:15 -0700)]
lib/ast: replace header guards with more modern #pragma once
Matthew Fernandez [Thu, 14 Oct 2021 01:10:34 +0000 (01:10 +0000)]
Merge branch 'smattr/
4755772E -A42F-4DB2-A389-
E4304FB44BBC ' into 'main'
smyrna: more dead code removal
See merge request graphviz/graphviz!2214
Matthew Fernandez [Sun, 10 Oct 2021 17:28:36 +0000 (10:28 -0700)]
smyrna: remove unused 'DOT_SIZE_CORRECTION_FAC'
Matthew Fernandez [Sun, 10 Oct 2021 17:28:16 +0000 (10:28 -0700)]
smyrna: remove unused 'SPHERE_SLICE_COUNT'
Matthew Fernandez [Sun, 10 Oct 2021 17:27:53 +0000 (10:27 -0700)]
smyrna: remove unused 'DOUBLE_IT'
Matthew Fernandez [Sun, 10 Oct 2021 17:27:35 +0000 (10:27 -0700)]
smyrna: remove unused 'GL_DOTSIZE_CONSTANT'
Matthew Fernandez [Sun, 10 Oct 2021 17:27:13 +0000 (10:27 -0700)]
smyrna: remove unused node limit constants
Matthew Fernandez [Sun, 10 Oct 2021 17:26:52 +0000 (10:26 -0700)]
smyrna: remove unused Z plane constants
Matthew Fernandez [Sun, 10 Oct 2021 17:26:26 +0000 (10:26 -0700)]
smyrna: remove unused 'UNHIGHLIGHTED_ALPHA'
Matthew Fernandez [Sun, 10 Oct 2021 17:26:02 +0000 (10:26 -0700)]
smyrna: remove unused 'RAD2DEG'
Matthew Fernandez [Sun, 10 Oct 2021 17:25:32 +0000 (10:25 -0700)]
smyrna: remove unused 'ZOOM_STEP', 'ZOOM_STEPS'
Matthew Fernandez [Sun, 10 Oct 2021 17:24:20 +0000 (10:24 -0700)]
smyrna: remove unused 'GLOBAL_Z_OFFSET'
Matthew Fernandez [Sun, 10 Oct 2021 17:22:30 +0000 (10:22 -0700)]
smyrma: remove duplicate 'xml' declaration
This is declared in gui.h that is already included in this target file.
Matthew Fernandez [Sun, 10 Oct 2021 17:21:09 +0000 (10:21 -0700)]
smyrna: remove unused union names
Matthew Fernandez [Wed, 13 Oct 2021 16:03:12 +0000 (16:03 +0000)]
Merge branch 'smattr/
2633d9ac -c5e9-4556-b4cd-
b4b879e4add7 ' into 'main'
some ps_txt-related clean up
See merge request graphviz/graphviz!2217
Matthew Fernandez [Sun, 10 Oct 2021 21:06:55 +0000 (14:06 -0700)]
user_init: use a C99 bool for 'saw_bb'
Matthew Fernandez [Sun, 10 Oct 2021 21:05:09 +0000 (14:05 -0700)]
cat_libfile: use a C99 bool for 'use_stdlib'
Matthew Fernandez [Sun, 10 Oct 2021 21:02:07 +0000 (14:02 -0700)]
remove unnecessary 'Show_boxes' cast
`Show_boxes` is already a `const char**`.
Matthew Fernandez [Sun, 10 Oct 2021 20:56:47 +0000 (13:56 -0700)]
ps_txt: fuse array strings, accelerating 'cat_libfile'
The `ps_txt` array is only used in calls to `cat_libfile`, which does not need a
single line per array entry. By fusing all strings into the first `ps_txt` array
entry, we can reduce the number of eventual `gvputs` calls, accelerating the
entire operation.
Matthew Fernandez [Sun, 10 Oct 2021 20:34:06 +0000 (13:34 -0700)]
disable clang formatting in ps.h and reflow lines
Following
96136309542ef71101600335147fcd19253a5fde , in retrospect it seems this
file is more readable with reflowing of long lines disabled.
Matthew Fernandez [Wed, 13 Oct 2021 14:55:08 +0000 (14:55 +0000)]
Merge branch 'fix_windows_if_have_gts' into 'main'
The preprocessor constant HAVE_GTS should be undefined like others similar flags.
See merge request graphviz/graphviz!2221
Primhill Computers [Tue, 12 Oct 2021 07:47:58 +0000 (08:47 +0100)]
The preprocessor constant HAVE_GTS should be undefined like others similar flags.
Magnus Jacobsson [Tue, 12 Oct 2021 07:15:26 +0000 (07:15 +0000)]
Merge branch 'addendum-fix-bom-in-graphviz-version-file' into 'main'
Don't generate useless GRAPHVIZ_VERSION file in macOS CMake build CI job
See merge request graphviz/graphviz!2213
Magnus Jacobsson [Sun, 10 Oct 2021 10:05:20 +0000 (12:05 +0200)]
CI: move generation of COLLECTION from macOS build template to individual jobs
This is no functional change, but makes the macOS build jobs more
similar to the Linux build jobs and opens up for letting the macOS
CMake and autotools builds use different COLLECTION in the future.
Magnus Jacobsson [Sun, 10 Oct 2021 09:06:31 +0000 (11:06 +0200)]
CI: don't generate GRAPHVIZ_VERSION file in macOS CMake build job
The version is generated internally to a variable in the CMake build
job and the downstream test job generates the file itself since commit
fea17b6a9738eb96f037e22538d1885a75f20698 .
This commit moves the generation of the GRAPHVIZ_VERSION file from the
build template to the macOS autotools build job.
Magnus Jacobsson [Mon, 11 Oct 2021 06:43:31 +0000 (06:43 +0000)]
Merge branch 'fix-awk-crlf-agnosticity-on-macos-catalina' into 'main'
Fix problem with awk crlf agnosticity on macOS Catalina
See merge request graphviz/graphviz!2210
Magnus Jacobsson [Sat, 9 Oct 2021 13:57:44 +0000 (15:57 +0200)]
common: CMake: make awk crlf agnostic when generating svgcolor_lib only when using Cygwin
Magnus Jacobsson [Sat, 9 Oct 2021 13:58:46 +0000 (15:58 +0200)]
common: autotools: make awk crlf agnostic when generating svgcolor_lib only when using Cygwin
Matthew Fernandez [Sun, 10 Oct 2021 21:35:32 +0000 (21:35 +0000)]
Merge branch 'smattr/
B8F865EA -1BE4-4990-96CF-
2D5DCEB70122 ' into 'main'
libgvc: replace header guards with more modern #pragma once
See merge request graphviz/graphviz!2212
Matthew Fernandez [Sun, 10 Oct 2021 04:12:10 +0000 (21:12 -0700)]
libgvc: replace header guards with more modern #pragma once
Matthew Fernandez [Sun, 10 Oct 2021 20:17:12 +0000 (20:17 +0000)]
Merge branch 'smattr/
0c5e6e8f -e750-47bf-b91f-
d2c13242d5d1 ' into 'main'
remove generation of ps.h and commit generated output instead
See merge request graphviz/graphviz!2211
Matthew Fernandez [Sat, 9 Oct 2021 21:24:03 +0000 (14:24 -0700)]
remove generation of ps.h and commit generated output instead
The generation of ps.h from ps.txt was trivial and ps.txt was no easier to edit
or update than the resulting generated header. Removing it and using a static
source instead accelerates all three builds, increases portability and moves
towards dropping the dependency on Awk.
Related to #2118.
Matthew Fernandez [Sun, 10 Oct 2021 19:15:30 +0000 (19:15 +0000)]
Merge branch 'smattr/
a5361ad7 -b54f-484d-9fde-
b9b85f00e0d4 ' into 'main'
lib/dotgen: clean up and warning squashing
See merge request graphviz/graphviz!2203
Matthew Fernandez [Thu, 7 Oct 2021 03:56:23 +0000 (20:56 -0700)]
sameport: remove unused parameter
Matthew Fernandez [Thu, 7 Oct 2021 03:55:37 +0000 (20:55 -0700)]
sameport.c: remove obsolete code
Matthew Fernandez [Thu, 7 Oct 2021 03:53:20 +0000 (20:53 -0700)]
zapLayers: remove unused parameter
Matthew Fernandez [Thu, 7 Oct 2021 03:50:21 +0000 (20:50 -0700)]
completeregularpath: squash a -Wunused-parameter warning
Matthew Fernandez [Thu, 7 Oct 2021 03:48:36 +0000 (20:48 -0700)]
make_regular_edge: use a proper boolean for checking edge type is spline
This change also removes a -Wshadow compiler warning.
Matthew Fernandez [Thu, 7 Oct 2021 03:43:31 +0000 (20:43 -0700)]
dotsplines.c: rephrase some open coded fmin, fmax
Matthew Fernandez [Thu, 7 Oct 2021 03:43:16 +0000 (20:43 -0700)]
dotsplines.c: remove commented out code
Matthew Fernandez [Thu, 7 Oct 2021 03:34:44 +0000 (20:34 -0700)]
dotsplines.c: remove unnecessary bracketing