]>
granicus.if.org Git - graphviz/log
Matthew Fernandez [Wed, 31 Mar 2021 02:08:49 +0000 (19:08 -0700)]
remove internal definitions of NULL
ISO C guarantees this to exist via stddef.h or stdlib.h.
Matthew Fernandez [Wed, 31 Mar 2021 02:07:52 +0000 (19:07 -0700)]
include stddef.h in some files that are using NULL
These were relying on picking up NULL through one of their other includes. We
are about to remove some internal definitions of NULL that may affect this, so
adding explicit stddef.h includes guards against these upcoming changes.
Matthew Fernandez [Wed, 31 Mar 2021 02:07:28 +0000 (19:07 -0700)]
remove stray line feed characters
Matthew Fernandez [Wed, 31 Mar 2021 02:06:55 +0000 (19:06 -0700)]
remove unhelpful comment
Matthew Fernandez [Wed, 31 Mar 2021 02:06:40 +0000 (19:06 -0700)]
remove some commented out code
Matthew Fernandez [Sun, 4 Apr 2021 17:30:12 +0000 (17:30 +0000)]
Merge branch 'smattr/
20D31C39 -98CB-43AC-89A4-
D37C86FA81E3 ' into 'main'
clean up lib/twopigen/circle.c
See merge request graphviz/graphviz!1874
Matthew Fernandez [Mon, 29 Mar 2021 04:55:40 +0000 (21:55 -0700)]
swap an unnecessary MAX call for fmax
Matthew Fernandez [Mon, 29 Mar 2021 04:48:50 +0000 (21:48 -0700)]
move some definitions closer to their usage
Matthew Fernandez [Mon, 29 Mar 2021 04:34:38 +0000 (21:34 -0700)]
more precise return type for isLeaf
Matthew Fernandez [Mon, 29 Mar 2021 04:30:40 +0000 (21:30 -0700)]
squash -Wcompare, -Wconversion, -Wsign-convertion warnings
Matthew Fernandez [Mon, 29 Mar 2021 04:26:48 +0000 (21:26 -0700)]
squash some -Wsign-compare warnings
Matthew Fernandez [Mon, 29 Mar 2021 04:01:37 +0000 (21:01 -0700)]
squash a -Wsign-compare and a -Wconversion compiler warnings
Matthew Fernandez [Mon, 29 Mar 2021 03:56:03 +0000 (20:56 -0700)]
remove some commented out code
Matthew Fernandez [Mon, 29 Mar 2021 03:53:42 +0000 (20:53 -0700)]
squash -Wconversion compiler warning
This also squashes a -Wsign-compare and a -Wsign-conversion warning.
Matthew Fernandez [Sun, 4 Apr 2021 05:47:52 +0000 (05:47 +0000)]
Merge branch 'smattr/
D2AA2D59 -2982-42CC-9CA3-
374F58FDC5B2 ' into 'main'
fix: put HTML bit at the top of the count in reference counted strings
Closes #1984
See merge request graphviz/graphviz!1873
Matthew Fernandez [Mon, 29 Mar 2021 03:00:59 +0000 (20:00 -0700)]
simplify some debugging code
Matthew Fernandez [Mon, 29 Mar 2021 02:53:32 +0000 (19:53 -0700)]
remove unused struct name
Matthew Fernandez [Mon, 29 Mar 2021 02:51:51 +0000 (19:51 -0700)]
use a bitfield instead of shifting and masking for reference count in refstr.c
This performs the same operations, but asks the compiler to generate the
required shifts and masks instead of relying on the error prone process of doing
them manually.
Matthew Fernandez [Mon, 29 Mar 2021 02:37:08 +0000 (19:37 -0700)]
fix: put HTML bit at the top of the count in reference counted strings
lib/cgraph/refstr.c implements reference-counted strings with the structure
refstr_t. Since the initial commit of cgraph,
d7767d4b5c511afa89b46798eea4e2f915930844 , HTML_BIT has been (IMHO incorrectly)
set based on unsigned int instead of unsigned long. Presumably this was not an
issue because most machines were 32-bit x86 at the time, where
sizeof(unsigned int) == sizeof(unsigned long).
In the transition to x86-64 machines, this setup became awkward. The reference
count is 8 bytes wide, but HTML_BIT is set to be bit 31. I.e. the bit indicating
that a string is HTML is now in the middle of the reference count. A string with
≥ 2³¹ references, something that is possible on an x86-64 machine, now
accidentally sets the HTML bit. Note that this ecosystem transition also made
the comment about HTML_BIT incorrect, /* msbit of unsigned long */.
d1244c8001e8c681def4c0ff25a91136845c2a75 did a tree-wide replacement of unsigned
long with uint64_t, which further compounded the situation. Now the HTML bit is
in the incorrect position on both 32-bit and 64-bit x86.
The present change fixes this by moving the HTML bit into bit 63 of the refcnt
field. Fixes #1984.
It is questionable whether this even needs to be a bitfield, and not simply a
uint64_t and a bool, but I think we should leave this space optimization in
place for now.
Matthew Fernandez [Sat, 3 Apr 2021 04:33:44 +0000 (04:33 +0000)]
Merge branch 'smattr/
f4713040 -3ec5-4d22-9ea3-
48bdc47c1eae ' into 'main'
remove a use of setjmp/longjmp
See merge request graphviz/graphviz!1871
Matthew Fernandez [Sat, 27 Mar 2021 20:17:33 +0000 (13:17 -0700)]
remove -Wshadow warning in conc.c
Matthew Fernandez [Sat, 27 Mar 2021 20:12:32 +0000 (13:12 -0700)]
remove now-unused jmp_buf
Related to #1801.
Matthew Fernandez [Sat, 27 Mar 2021 20:06:38 +0000 (13:06 -0700)]
remove the use of longjmp to indicate failure in rebuild_vlists
Related to #1801.
Matthew Fernandez [Sat, 27 Mar 2021 20:01:09 +0000 (13:01 -0700)]
anticipate non-zero return from rebuild_vlists
This is a step towards removing a longjmp call from rebuild_vlists. Related to
#1801.
Matthew Fernandez [Sat, 27 Mar 2021 19:55:56 +0000 (12:55 -0700)]
add a return value to rebuild_vlists
This is step towards removing the use of longjmp in this function. Related to
#1801.
Matthew Fernandez [Sat, 3 Apr 2021 03:48:24 +0000 (03:48 +0000)]
Merge branch 'smattr/
F9620D3B -7BEF-49CD-85DD-
CB9FEB3B07AF ' into 'main'
switch to Gitlab shared macOS runners for CI
See merge request graphviz/graphviz!1872
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
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.
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
Matthew Fernandez [Sat, 27 Mar 2021 16:08:26 +0000 (09:08 -0700)]
remove some commented out code
Matthew Fernandez [Sat, 27 Mar 2021 16:08:16 +0000 (09:08 -0700)]
remove some unnecessary bracketing
Matthew Fernandez [Sat, 27 Mar 2021 16:07:09 +0000 (09:07 -0700)]
remove some useless code
Matthew Fernandez [Sat, 27 Mar 2021 16:05:59 +0000 (09:05 -0700)]
replace some unnecessary MIN calls with fmin
Matthew Fernandez [Sat, 27 Mar 2021 16:05:21 +0000 (09:05 -0700)]
replace some unnecessary MAX calls with fmax
Matthew Fernandez [Sat, 27 Mar 2021 15:58:38 +0000 (08:58 -0700)]
remove unused g parameter from markSmall
Matthew Fernandez [Sat, 27 Mar 2021 15:57:00 +0000 (08:57 -0700)]
remove unused cp parameter from updateWt
Matthew Fernandez [Sat, 27 Mar 2021 15:56:24 +0000 (08:56 -0700)]
squash some -Wunused-parameter warnings
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
Matthew Fernandez [Sat, 27 Mar 2021 01:11:02 +0000 (18:11 -0700)]
fix: missing counting refactor and fatal errors in Pylint metrics
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
Matthew Fernandez [Sun, 3 Jan 2021 01:39:50 +0000 (17:39 -0800)]
replace Smyrna use of sfstropen with agxbuf
Related to #1873.
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
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.
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
Matthew Fernandez [Wed, 24 Mar 2021 04:06:34 +0000 (21:06 -0700)]
placeLabels: move definition of i closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 04:06:15 +0000 (21:06 -0700)]
xlspdxload: move definition of op closer its use
Matthew Fernandez [Wed, 24 Mar 2021 04:05:56 +0000 (21:05 -0700)]
xlhdxload: move definition of i closer to its use
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.
Matthew Fernandez [Wed, 24 Mar 2021 04:05:05 +0000 (21:05 -0700)]
xlintersections: 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
Matthew Fernandez [Wed, 24 Mar 2021 04:04:16 +0000 (21:04 -0700)]
hd_hil_s_from_xy: move definitions closer to their use
Matthew Fernandez [Wed, 24 Mar 2021 04:03:45 +0000 (21:03 -0700)]
xlnew: move definition of xlp closer to its use
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
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
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
Matthew Fernandez [Wed, 24 Mar 2021 04:01:47 +0000 (21:01 -0700)]
PickSeeds: move definitions closer to their use
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
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
Matthew Fernandez [Wed, 24 Mar 2021 04:00:21 +0000 (21:00 -0700)]
SplitNode: move definitions closer to their use and use better types
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.
Matthew Fernandez [Wed, 24 Mar 2021 03:58:29 +0000 (20:58 -0700)]
Overlap: 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
Matthew Fernandez [Wed, 24 Mar 2021 03:57:45 +0000 (20:57 -0700)]
RectArea: move definitions closer to their use
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
Matthew Fernandez [Wed, 24 Mar 2021 03:56:54 +0000 (20:56 -0700)]
NullRect: condense initialization of r
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
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
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
Matthew Fernandez [Wed, 24 Mar 2021 03:54:49 +0000 (20:54 -0700)]
PickBranch: move definition of i closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 03:54:29 +0000 (20:54 -0700)]
NodeCover: move definitions closer to their use and use better types
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
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
Matthew Fernandez [Wed, 24 Mar 2021 03:53:17 +0000 (20:53 -0700)]
RTreeNewNode: move definition of n 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
Matthew Fernandez [Wed, 24 Mar 2021 03:52:17 +0000 (20:52 -0700)]
RTreeDelete: move definitions closer to their use and use better types
Matthew Fernandez [Wed, 24 Mar 2021 03:51:47 +0000 (20:51 -0700)]
RTreeInsert2: move definition of i closer to its use
Matthew Fernandez [Wed, 24 Mar 2021 03:51:22 +0000 (20:51 -0700)]
RTreeInsert: move definitions closer to their use and use better types
Matthew Fernandez [Wed, 24 Mar 2021 03:50:56 +0000 (20:50 -0700)]
reflow RTreeInsert2 prototype
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
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
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
Matthew Fernandez [Wed, 24 Mar 2021 03:48:02 +0000 (20:48 -0700)]
RTreeClose2: push definition of i 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
Matthew Fernandez [Wed, 24 Mar 2021 03:47:09 +0000 (20:47 -0700)]
RTreeLeafListFree: push definition of tlp 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
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.
Matthew Fernandez [Wed, 24 Mar 2021 03:09:59 +0000 (20:09 -0700)]
use more modern #pragma once guards in lib/label
Matthew Fernandez [Wed, 24 Mar 2021 03:09:30 +0000 (20:09 -0700)]
remove unnecessary CoverAll declaration
This symbol is unused in this file.
Matthew Fernandez [Wed, 24 Mar 2021 03:09:10 +0000 (20:09 -0700)]
remove commented out code
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.
Matthew Fernandez [Wed, 24 Mar 2021 02:57:07 +0000 (19:57 -0700)]
remove unused parameter to RTreeReInsert
Matthew Fernandez [Wed, 24 Mar 2021 02:55:35 +0000 (19:55 -0700)]
remove unused parameter to objplpmks
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.
Matthew Fernandez [Wed, 24 Mar 2021 02:52:48 +0000 (19:52 -0700)]
squash some -Wunused-parameter warnings
Matthew Fernandez [Wed, 24 Mar 2021 02:47:51 +0000 (19:47 -0700)]
remove some open coded fmax
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
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.
Matthew Fernandez [Tue, 23 Mar 2021 02:22:14 +0000 (19:22 -0700)]
replace neatogen header guards with more modern #pragma once
Matthew Fernandez [Tue, 23 Mar 2021 03:45:45 +0000 (20:45 -0700)]
remove commented out code
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.