]> granicus.if.org Git - graphviz/log
graphviz
3 years agomove macOS CI jobs to Gitlab shared runner
Matthew Fernandez [Sat, 27 Mar 2021 21:09:11 +0000 (14:09 -0700)]
move macOS CI jobs to Gitlab shared runner

The macOS CI closed beta program Graphviz has been participating in is winding
down. As of 2021-03-24, we have been requested to migrate to a shared macOS
runner as the program transitions into an open beta [0]. The cut over date for
this is scheduled for 2021-04-07. This change causes our CI setup to now run
macOS jobs on this shared runner instead of the reserved macOS VM Graphviz had
during the closed beta.

Note that this change also migrates these CI jobs from macOS 10.15.6 (Catalina)
to macOS 11.2 (Big Sur). With this, the XCode version is expected to move
forwards as well, though I do not know the precise version numbers.

Related to #1727.

  [0]: https://gitlab.com/gitlab-com/macos-buildcloud-runners-beta/-/issues/3#note_536852935

3 years agofix: install dependencies in macOS test tasks
Matthew Fernandez [Sun, 28 Mar 2021 00:22:50 +0000 (17:22 -0700)]
fix: install dependencies in macOS test tasks

These tasks were passing despite missing steps to install dependencies because
the current private beta macOS runner Graphviz uses is stateful. Moving to the
stateless shared macOS runner for the open beta exposes that testing fails
because the runtime dependencies of Graphviz are missing.

3 years agoMerge branch 'smattr/02B780E5-FA0B-4FE5-94B8-9979AA32D4F4' into 'main'
Matthew Fernandez [Sat, 3 Apr 2021 02:40:14 +0000 (02:40 +0000)]
Merge branch 'smattr/02B780E5-FA0B-4FE5-94B8-9979AA32D4F4' into 'main'

maze.c warning squashing and clean up

See merge request graphviz/graphviz!1870

3 years agoremove some commented out code
Matthew Fernandez [Sat, 27 Mar 2021 16:08:26 +0000 (09:08 -0700)]
remove some commented out code

3 years agoremove some unnecessary bracketing
Matthew Fernandez [Sat, 27 Mar 2021 16:08:16 +0000 (09:08 -0700)]
remove some unnecessary bracketing

3 years agoremove some useless code
Matthew Fernandez [Sat, 27 Mar 2021 16:07:09 +0000 (09:07 -0700)]
remove some useless code

3 years agoreplace some unnecessary MIN calls with fmin
Matthew Fernandez [Sat, 27 Mar 2021 16:05:59 +0000 (09:05 -0700)]
replace some unnecessary MIN calls with fmin

3 years agoreplace some unnecessary MAX calls with fmax
Matthew Fernandez [Sat, 27 Mar 2021 16:05:21 +0000 (09:05 -0700)]
replace some unnecessary MAX calls with fmax

3 years agoremove unused g parameter from markSmall
Matthew Fernandez [Sat, 27 Mar 2021 15:58:38 +0000 (08:58 -0700)]
remove unused g parameter from markSmall

3 years agoremove unused cp parameter from updateWt
Matthew Fernandez [Sat, 27 Mar 2021 15:57:00 +0000 (08:57 -0700)]
remove unused cp parameter from updateWt

3 years agosquash some -Wunused-parameter warnings
Matthew Fernandez [Sat, 27 Mar 2021 15:56:24 +0000 (08:56 -0700)]
squash some -Wunused-parameter warnings

3 years agoMerge branch 'smattr/279B0FC2-0820-4378-A2DF-3A0EDB8B463E' into 'main'
Matthew Fernandez [Fri, 2 Apr 2021 04:15:34 +0000 (04:15 +0000)]
Merge branch 'smattr/279B0FC2-0820-4378-A2DF-3A0EDB8B463E' into 'main'

fix: missing counting refactor and fatal errors in Pylint metrics

See merge request graphviz/graphviz!1867

3 years agofix: missing counting refactor and fatal errors in Pylint metrics
Matthew Fernandez [Sat, 27 Mar 2021 01:11:02 +0000 (18:11 -0700)]
fix: missing counting refactor and fatal errors in Pylint metrics

3 years agoMerge branch 'smattr/CE58A1C5-3233-40B6-AB51-1094448247F0' into 'main'
Matthew Fernandez [Fri, 2 Apr 2021 03:38:19 +0000 (03:38 +0000)]
Merge branch 'smattr/CE58A1C5-3233-40B6-AB51-1094448247F0' into 'main'

replace Smyrna use of sfstropen with agxbuf

See merge request graphviz/graphviz!1868

3 years agoreplace Smyrna use of sfstropen with agxbuf
Matthew Fernandez [Sun, 3 Jan 2021 01:39:50 +0000 (17:39 -0800)]
replace Smyrna use of sfstropen with agxbuf

Related to #1873.

3 years agoMerge branch 'grammar-align' into 'main'
Mark Hansen [Wed, 31 Mar 2021 09:41:12 +0000 (09:41 +0000)]
Merge branch 'grammar-align' into 'main'

docs: Remove deprecated HTML attributes in generation

See merge request graphviz/graphviz!1877

3 years agoRemove deprecated HTML attributes in generation
Mark Hansen [Wed, 31 Mar 2021 09:12:56 +0000 (20:12 +1100)]
Remove deprecated HTML attributes in generation

Style the generated code with CSS instead.

3 years agoMerge branch 'smattr/4D210743-7509-4642-AB03-14BCBC375538' into 'main'
Matthew Fernandez [Wed, 31 Mar 2021 00:43:47 +0000 (00:43 +0000)]
Merge branch 'smattr/4D210743-7509-4642-AB03-14BCBC375538' into 'main'

clean up and warning squashing in lib/label

See merge request graphviz/graphviz!1866

3 years agoplaceLabels: move definition of i closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 04:06:34 +0000 (21:06 -0700)]
placeLabels: move definition of i closer to its use

3 years agoxlspdxload: move definition of op closer its use
Matthew Fernandez [Wed, 24 Mar 2021 04:06:15 +0000 (21:06 -0700)]
xlspdxload: move definition of op closer its use

3 years agoxlhdxload: move definition of i closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 04:05:56 +0000 (21:05 -0700)]
xlhdxload: move definition of i closer to its use

3 years agoxladjust: abbreviate some zeroing
Matthew Fernandez [Wed, 24 Mar 2021 04:05:27 +0000 (21:05 -0700)]
xladjust: abbreviate some zeroing

The compiler understands a shorter memory-zeroing idiom.

3 years agoxlintersections: move definitions closer to their use
Matthew Fernandez [Wed, 24 Mar 2021 04:05:05 +0000 (21:05 -0700)]
xlintersections: move definitions closer to their use

3 years agoaabbaabb: move definitions closer to their use
Matthew Fernandez [Wed, 24 Mar 2021 04:04:33 +0000 (21:04 -0700)]
aabbaabb: move definitions closer to their use

3 years agohd_hil_s_from_xy: move definitions closer to their use
Matthew Fernandez [Wed, 24 Mar 2021 04:04:16 +0000 (21:04 -0700)]
hd_hil_s_from_xy: move definitions closer to their use

3 years agoxlnew: move definition of xlp closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 04:03:45 +0000 (21:03 -0700)]
xlnew: move definition of xlp closer to its use

3 years agoPrintPVars: move definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 04:03:23 +0000 (21:03 -0700)]
PrintPVars: move definition of i closer to its use and use a better type

3 years agoInitPVars: move definition of i closer to its use and use a bette type
Matthew Fernandez [Wed, 24 Mar 2021 04:02:27 +0000 (21:02 -0700)]
InitPVars: move definition of i closer to its use and use a bette type

3 years agoLoadNodes: move definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 04:02:09 +0000 (21:02 -0700)]
LoadNodes: move definition of i closer to its use and use a better type

3 years agoPickSeeds: move definitions closer to their use
Matthew Fernandez [Wed, 24 Mar 2021 04:01:47 +0000 (21:01 -0700)]
PickSeeds: move definitions closer to their use

3 years agoMethodZero: move definition of i closer to its use and use a bette type
Matthew Fernandez [Wed, 24 Mar 2021 04:01:18 +0000 (21:01 -0700)]
MethodZero: move definition of i closer to its use and use a bette type

3 years agoGetBranches: move definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 04:00:48 +0000 (21:00 -0700)]
GetBranches: move definition of i closer to its use and use a better type

3 years agoSplitNode: move definitions closer to their use and use better types
Matthew Fernandez [Wed, 24 Mar 2021 04:00:21 +0000 (21:00 -0700)]
SplitNode: move definitions closer to their use and use better types

3 years agoContained: move definitions closer to their use an optimize algorithm
Matthew Fernandez [Wed, 24 Mar 2021 03:58:53 +0000 (20:58 -0700)]
Contained: move definitions closer to their use an optimize algorithm

There's no need to track a result variable. We can just return early when we
know the answer.

3 years agoOverlap: move definitions closer to their use and use better types
Matthew Fernandez [Wed, 24 Mar 2021 03:58:29 +0000 (20:58 -0700)]
Overlap: move definitions closer to their use and use better types

3 years agoCombineRect: move definitions closer to their use and use better types
Matthew Fernandez [Wed, 24 Mar 2021 03:58:03 +0000 (20:58 -0700)]
CombineRect: move definitions closer to their use and use better types

3 years agoRectArea: move definitions closer to their use
Matthew Fernandez [Wed, 24 Mar 2021 03:57:45 +0000 (20:57 -0700)]
RectArea: move definitions closer to their use

3 years agoPrintRect: move definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 03:57:12 +0000 (20:57 -0700)]
PrintRect: move definition of i closer to its use and use a better type

3 years agoNullRect: condense initialization of r
Matthew Fernandez [Wed, 24 Mar 2021 03:56:54 +0000 (20:56 -0700)]
NullRect: condense initialization of r

3 years agoInitRect: move definition of i closer its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 03:56:29 +0000 (20:56 -0700)]
InitRect: move definition of i closer its use and use a better type

3 years agocheckOpt: move definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 03:56:04 +0000 (20:56 -0700)]
checkOpt: move definition of i closer to its use and use a better type

3 years agoAddBranch: move definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 03:55:08 +0000 (20:55 -0700)]
AddBranch: move definition of i closer to its use and use a better type

3 years agoPickBranch: move definition of i closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 03:54:49 +0000 (20:54 -0700)]
PickBranch: move definition of i closer to its use

3 years agoNodeCover: move definitions closer to their use and use better types
Matthew Fernandez [Wed, 24 Mar 2021 03:54:29 +0000 (20:54 -0700)]
NodeCover: move definitions closer to their use and use better types

3 years agoPrintNode: move definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 03:54:00 +0000 (20:54 -0700)]
PrintNode: move definition of i closer to its use and use a better type

3 years agoInitNode: move definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 03:53:34 +0000 (20:53 -0700)]
InitNode: move definition of i closer to its use and use a better type

3 years agoRTreeNewNode: move definition of n closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 03:53:17 +0000 (20:53 -0700)]
RTreeNewNode: move definition of n closer to its use

3 years agoRTreeDelete2: move definition of i closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 03:52:40 +0000 (20:52 -0700)]
RTreeDelete2: move definition of i closer to its use

3 years agoRTreeDelete: move definitions closer to their use and use better types
Matthew Fernandez [Wed, 24 Mar 2021 03:52:17 +0000 (20:52 -0700)]
RTreeDelete: move definitions closer to their use and use better types

3 years agoRTreeInsert2: move definition of i closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 03:51:47 +0000 (20:51 -0700)]
RTreeInsert2: move definition of i closer to its use

3 years agoRTreeInsert: move definitions closer to their use and use better types
Matthew Fernandez [Wed, 24 Mar 2021 03:51:22 +0000 (20:51 -0700)]
RTreeInsert: move definitions closer to their use and use better types

3 years agoreflow RTreeInsert2 prototype
Matthew Fernandez [Wed, 24 Mar 2021 03:50:56 +0000 (20:50 -0700)]
reflow RTreeInsert2 prototype

3 years agoRTreeSearch: push definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 03:49:51 +0000 (20:49 -0700)]
RTreeSearch: push definition of i closer to its use and use a better type

3 years agoPrintData: push definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 03:48:54 +0000 (20:48 -0700)]
PrintData: push definition of i closer to its use and use a better type

3 years agoPrintIndex: push definition of i closer to its use and use a better type
Matthew Fernandez [Wed, 24 Mar 2021 03:48:23 +0000 (20:48 -0700)]
PrintIndex: push definition of i closer to its use and use a better type

3 years agoRTreeClose2: push definition of i closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 03:48:02 +0000 (20:48 -0700)]
RTreeClose2: push definition of i closer to its use

3 years agoRTreeNewIndex: push definition of x closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 03:47:36 +0000 (20:47 -0700)]
RTreeNewIndex: push definition of x closer to its use

3 years agoRTreeLeafListFree: push definition of tlp closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 03:47:09 +0000 (20:47 -0700)]
RTreeLeafListFree: push definition of tlp closer to its use

3 years agoRTreeLeafListAdd: push nlp definition closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 03:46:32 +0000 (20:46 -0700)]
RTreeLeafListAdd: push nlp definition closer to its use

3 years agosimplify printf format in PrintNode
Matthew Fernandez [Wed, 24 Mar 2021 03:41:02 +0000 (20:41 -0700)]
simplify printf format in PrintNode

Under C99, we have %p for pointers.

3 years agouse more modern #pragma once guards in lib/label
Matthew Fernandez [Wed, 24 Mar 2021 03:09:59 +0000 (20:09 -0700)]
use more modern #pragma once guards in lib/label

3 years agoremove unnecessary CoverAll declaration
Matthew Fernandez [Wed, 24 Mar 2021 03:09:30 +0000 (20:09 -0700)]
remove unnecessary CoverAll declaration

This symbol is unused in this file.

3 years agoremove commented out code
Matthew Fernandez [Wed, 24 Mar 2021 03:09:10 +0000 (20:09 -0700)]
remove commented out code

3 years agoremove cryptic comment
Matthew Fernandez [Wed, 24 Mar 2021 03:01:29 +0000 (20:01 -0700)]
remove cryptic comment

I guess this is a hint to some editor I am not aware of.

3 years agoremove unused parameter to RTreeReInsert
Matthew Fernandez [Wed, 24 Mar 2021 02:57:07 +0000 (19:57 -0700)]
remove unused parameter to RTreeReInsert

3 years agoremove unused parameter to objplpmks
Matthew Fernandez [Wed, 24 Mar 2021 02:55:35 +0000 (19:55 -0700)]
remove unused parameter to objplpmks

3 years agoremove hand rolled floor(log2())
Matthew Fernandez [Wed, 24 Mar 2021 02:53:16 +0000 (19:53 -0700)]
remove hand rolled floor(log2())

We do not need a custom optimized version of this. Modern compilers know these
functions as built-ins and can do their own better optimizations.

3 years agosquash some -Wunused-parameter warnings
Matthew Fernandez [Wed, 24 Mar 2021 02:52:48 +0000 (19:52 -0700)]
squash some -Wunused-parameter warnings

3 years agoremove some open coded fmax
Matthew Fernandez [Wed, 24 Mar 2021 02:47:51 +0000 (19:47 -0700)]
remove some open coded fmax

3 years agoMerge branch 'smattr/450AD1C4-3E9D-4E93-95C6-279FC38EFCA3' into 'main'
Matthew Fernandez [Mon, 29 Mar 2021 05:13:03 +0000 (05:13 +0000)]
Merge branch 'smattr/450AD1C4-3E9D-4E93-95C6-279FC38EFCA3' into 'main'

some clean up of neatogen

See merge request graphviz/graphviz!1865

3 years agoreplace unnecessary max() implementation with libc fmaxf
Matthew Fernandez [Tue, 23 Mar 2021 04:15:08 +0000 (21:15 -0700)]
replace unnecessary max() implementation with libc fmaxf

No need to hand roll this ourselves now that we compile with C99.

3 years agoreplace neatogen header guards with more modern #pragma once
Matthew Fernandez [Tue, 23 Mar 2021 02:22:14 +0000 (19:22 -0700)]
replace neatogen header guards with more modern #pragma once

3 years agoremove commented out code
Matthew Fernandez [Tue, 23 Mar 2021 03:45:45 +0000 (20:45 -0700)]
remove commented out code

3 years agoremove C++ alternative in embed_graph.h
Matthew Fernandez [Tue, 23 Mar 2021 03:42:19 +0000 (20:42 -0700)]
remove C++ alternative in embed_graph.h

We only compile this header under C.

3 years agoremove inline NULL definition
Matthew Fernandez [Tue, 23 Mar 2021 03:39:14 +0000 (20:39 -0700)]
remove inline NULL definition

This is guaranteed to exist in C99.

3 years agoremove C++ alternative in dijkstra.h
Matthew Fernandez [Tue, 23 Mar 2021 03:33:59 +0000 (20:33 -0700)]
remove C++ alternative in dijkstra.h

Only the C versions of these functions are implemented.

3 years agoremove incorrect C++ alternative
Matthew Fernandez [Tue, 23 Mar 2021 03:30:34 +0000 (20:30 -0700)]
remove incorrect C++ alternative

The '&' is still required, regardless of whether this code is compiled with C or
C++. Note that this issue was latent as we never build this code as C++.

3 years agoremove unused sparsegraph.h C++ alternative
Matthew Fernandez [Tue, 23 Mar 2021 02:49:03 +0000 (19:49 -0700)]
remove unused sparsegraph.h C++ alternative

Similar to previous commits, this code is unused because we do not include it in
any C++ compilation.

3 years agoremove unused kkutils.h C++ alternative
Matthew Fernandez [Tue, 23 Mar 2021 02:29:51 +0000 (19:29 -0700)]
remove unused kkutils.h C++ alternative

This code is unused and in fact many of these prototyped functions are
unimplemented.

3 years agoremove commented out inline keywords
Matthew Fernandez [Tue, 23 Mar 2021 02:26:36 +0000 (19:26 -0700)]
remove commented out inline keywords

3 years agoremove some unnecessary __cplusplus guards
Matthew Fernandez [Tue, 23 Mar 2021 02:24:06 +0000 (19:24 -0700)]
remove some unnecessary __cplusplus guards

This file is C, and we build it as such. It is not expected that anyone will
compile this source as C++.

3 years agoremove alternative C++ Queue implementation in neatogen
Matthew Fernandez [Tue, 23 Mar 2021 02:20:03 +0000 (19:20 -0700)]
remove alternative C++ Queue implementation in neatogen

This code was written to provide two versions of the same API, one for C and one
for C++. This is unnecessary because the C API is already usable from C++.
Moreover, one can just use std::queue in C++. This code was not being used as we
only ever #include it from C files, so we just remove it to ease ongoing
maintenance.

3 years agoremove commented out #include
Matthew Fernandez [Tue, 23 Mar 2021 02:18:39 +0000 (19:18 -0700)]
remove commented out #include

3 years agoMerge branch 'smattr/619aeafd-3505-4392-aa61-49cdae0077aa' into 'main'
Matthew Fernandez [Mon, 29 Mar 2021 04:35:06 +0000 (04:35 +0000)]
Merge branch 'smattr/619aeafd-3505-4392-aa61-49cdae0077aa' into 'main'

fix: correctly handle HTML content ending in ]

Closes #1893

See merge request graphviz/graphviz!1859

3 years agofix: correctly handle HTML content ending in ]
Matthew Fernandez [Sun, 21 Mar 2021 03:04:27 +0000 (20:04 -0700)]
fix: correctly handle HTML content ending in ]

As described in the source comment in this commit, expat attempts to recognize
CDATA section enders which results in some internal buffering that Graphviz did
not anticipate. Specifically, any HTML content ending in "]" or "]]" would be
parsed with these characters truncated. The next call to expat would flush this
buffered data, resulting in Graphviz believing the next content was malformed.

For example, the content "my label]]]" would be parsed as the text "my label]".
The next call to expat would return "]]" prepended to whatever was then being
parsed.

Fixes #1893.

3 years agoadd a test case for #1893
Matthew Fernandez [Sun, 21 Mar 2021 01:42:52 +0000 (18:42 -0700)]
add a test case for #1893

3 years agoMerge branch 'smattr/F391EA36-8454-4A32-B815-1FAAEFD4006E' into 'main'
Matthew Fernandez [Mon, 29 Mar 2021 03:58:10 +0000 (03:58 +0000)]
Merge branch 'smattr/F391EA36-8454-4A32-B815-1FAAEFD4006E' into 'main'

some cgraph clean up

See merge request graphviz/graphviz!1858

3 years agoreflow some code
Matthew Fernandez [Sat, 20 Mar 2021 19:09:45 +0000 (12:09 -0700)]
reflow some code

3 years agocondense a malloc;memset
Matthew Fernandez [Sat, 20 Mar 2021 19:01:19 +0000 (12:01 -0700)]
condense a malloc;memset

The calloc function does the zeroing for you and can even be more efficient for
large allocations.

3 years agouse a stronger return type in not_default_attrs
Matthew Fernandez [Sat, 20 Mar 2021 18:56:58 +0000 (11:56 -0700)]
use a stronger return type in not_default_attrs

3 years agouse a stronger return type in has_no_predecessor_below
Matthew Fernandez [Sat, 20 Mar 2021 18:56:21 +0000 (11:56 -0700)]
use a stronger return type in has_no_predecessor_below

3 years agouse a stronger return type in has_no_edges
Matthew Fernandez [Sat, 20 Mar 2021 18:55:50 +0000 (11:55 -0700)]
use a stronger return type in has_no_edges

3 years agouse a stronger return type in write_node_test
Matthew Fernandez [Sat, 20 Mar 2021 18:55:20 +0000 (11:55 -0700)]
use a stronger return type in write_node_test

3 years agouse a stronger return type for node_in_subg
Matthew Fernandez [Sat, 20 Mar 2021 18:54:43 +0000 (11:54 -0700)]
use a stronger return type for node_in_subg

3 years agouse a stronger return type in irrelevant_subgraph
Matthew Fernandez [Sat, 20 Mar 2021 18:53:53 +0000 (11:53 -0700)]
use a stronger return type in irrelevant_subgraph

3 years agouse a stronger type for root variable
Matthew Fernandez [Sat, 20 Mar 2021 18:52:25 +0000 (11:52 -0700)]
use a stronger type for root variable

3 years agouse a stronger type for hasName variable
Matthew Fernandez [Sat, 20 Mar 2021 18:51:54 +0000 (11:51 -0700)]
use a stronger type for hasName variable

3 years agosimplify agcanonhtmlstr implementation
Matthew Fernandez [Sat, 20 Mar 2021 18:48:04 +0000 (11:48 -0700)]
simplify agcanonhtmlstr implementation

3 years agouse a stronger type for backslash_pending variable
Matthew Fernandez [Sat, 20 Mar 2021 18:45:57 +0000 (11:45 -0700)]
use a stronger type for backslash_pending variable

3 years agouse a stronger type for needs_quotes variable
Matthew Fernandez [Sat, 20 Mar 2021 18:44:50 +0000 (11:44 -0700)]
use a stronger type for needs_quotes variable