From 6531e806624e7a165e9d87f48f3bf51f1c6610ac Mon Sep 17 00:00:00 2001 From: Bernd Jendrissek Date: Wed, 3 Feb 2016 03:05:11 +0200 Subject: [PATCH] Don't output whitespace at the end of a line. --- gsymcheck/src/s_check.c | 13 ++++++------- gsymcheck/tests/buses.output | 2 +- gsymcheck/tests/connections1.output | 2 +- gsymcheck/tests/connections2.output | 4 ++-- gsymcheck/tests/connections3.output | 2 +- gsymcheck/tests/duplicate_net.output | 4 ++-- gsymcheck/tests/duplicate_pinnumber.output | 2 +- gsymcheck/tests/duplicate_pinseq.output | 2 +- gsymcheck/tests/graphical_incorrect.output | 2 +- gsymcheck/tests/invalid_slotdef1.output | 2 +- gsymcheck/tests/invalid_slotdef2.output | 2 +- gsymcheck/tests/invalid_slotdef3.output | 2 +- gsymcheck/tests/invalid_slotdef4.output | 2 +- gsymcheck/tests/labelinside.output | 2 +- gsymcheck/tests/lots_of_errors.output | 4 ++-- gsymcheck/tests/many_slotdefs.output | 2 +- gsymcheck/tests/misplaced_attributes.output | 4 ++-- gsymcheck/tests/missing_device.output | 2 +- gsymcheck/tests/missing_footprint.output | 2 +- gsymcheck/tests/missing_numslots.output | 2 +- gsymcheck/tests/missing_pinlabel.output | 2 +- gsymcheck/tests/missing_pinnumber.output | 2 +- gsymcheck/tests/missing_pinseq.output | 2 +- gsymcheck/tests/missing_slotdef.output | 2 +- gsymcheck/tests/multiple_footprint.output | 2 +- gsymcheck/tests/multiple_pinlabel.output | 2 +- gsymcheck/tests/multiple_pinnumber.output | 2 +- gsymcheck/tests/multiple_pinseq.output | 2 +- gsymcheck/tests/multiple_pintype.output | 2 +- gsymcheck/tests/multiple_refdes.output | 2 +- gsymcheck/tests/nameinside.output | 2 +- gsymcheck/tests/nets.output | 2 +- gsymcheck/tests/noslots.output | 2 +- gsymcheck/tests/old_symbol.output | 4 ++-- gsymcheck/tests/oldpins.output | 4 ++-- gsymcheck/tests/oldslot.output | 4 ++-- gsymcheck/tests/pin_offgrid.output | 4 ++-- gsymcheck/tests/pintypes.output | 2 +- gsymcheck/tests/typeinside.output | 2 +- gsymcheck/tests/urefinside.output | 2 +- gsymcheck/tests/zero_pinnumber.output | 2 +- gsymcheck/tests/zero_pinseq.output | 2 +- gsymcheck/tests/zero_slotnum.output | 2 +- gsymcheck/tests/zero_slots.output | 2 +- 44 files changed, 57 insertions(+), 58 deletions(-) diff --git a/gsymcheck/src/s_check.c b/gsymcheck/src/s_check.c index ebcacffca..515ebd4b0 100644 --- a/gsymcheck/src/s_check.c +++ b/gsymcheck/src/s_check.c @@ -117,15 +117,14 @@ s_check_symbol(TOPLEVEL *pr_current, PAGE *p_current, OBJECT *object_head) /* now report the info/warnings/errors to the user */ if (!quiet_mode) { - /* done, now print out the messages */ s_symstruct_print(s_symcheck); if (s_symcheck->warning_count > 0) { - s_log_message("%d warnings found ", + s_log_message("%d warnings found", s_symcheck->warning_count); if (verbose_mode < 2) { - s_log_message("(use -vv to view details)\n"); + s_log_message(" (use -vv to view details)\n"); } else { s_log_message("\n"); } @@ -134,18 +133,18 @@ s_check_symbol(TOPLEVEL *pr_current, PAGE *p_current, OBJECT *object_head) if (s_symcheck->error_count == 0) { s_log_message("No errors found\n"); } else if (s_symcheck->error_count == 1) { - s_log_message("1 ERROR found "); + s_log_message("1 ERROR found"); if (verbose_mode < 1) { - s_log_message("(use -v to view details)\n"); + s_log_message(" (use -v to view details)\n"); } else { s_log_message("\n"); } } else if (s_symcheck->error_count > 1) { - s_log_message("%d ERRORS found ", + s_log_message("%d ERRORS found", s_symcheck->error_count); if (verbose_mode < 1) { - s_log_message("(use -v to view details)\n"); + s_log_message(" (use -v to view details)\n"); } else { s_log_message("\n"); } diff --git a/gsymcheck/tests/buses.output b/gsymcheck/tests/buses.output index 50fa1b1eb..7d13e468c 100644 --- a/gsymcheck/tests/buses.output +++ b/gsymcheck/tests/buses.output @@ -1,2 +1,2 @@ ERROR: Found a bus inside a symbol -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/connections1.output b/gsymcheck/tests/connections1.output index cd1cdc60c..0a2cf9c05 100644 --- a/gsymcheck/tests/connections1.output +++ b/gsymcheck/tests/connections1.output @@ -1,4 +1,4 @@ ERROR: Found a net inside a symbol ERROR: Found a connection inside a symbol ERROR: Found a connection inside a symbol -3 ERRORS found +3 ERRORS found diff --git a/gsymcheck/tests/connections2.output b/gsymcheck/tests/connections2.output index 93ab2e13d..4dfeebb74 100644 --- a/gsymcheck/tests/connections2.output +++ b/gsymcheck/tests/connections2.output @@ -8,5 +8,5 @@ ERROR: Not enough pins in slotdef=3:9,10,8 ERROR: Not enough pins in slotdef=4:12,13,11 ERROR: Found a connection inside a symbol ERROR: Found a connection inside a symbol -2 warnings found -8 ERRORS found +2 warnings found +8 ERRORS found diff --git a/gsymcheck/tests/connections3.output b/gsymcheck/tests/connections3.output index 50fa1b1eb..7d13e468c 100644 --- a/gsymcheck/tests/connections3.output +++ b/gsymcheck/tests/connections3.output @@ -1,2 +1,2 @@ ERROR: Found a bus inside a symbol -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/duplicate_net.output b/gsymcheck/tests/duplicate_net.output index b5ea46ca4..13a2fd946 100644 --- a/gsymcheck/tests/duplicate_net.output +++ b/gsymcheck/tests/duplicate_net.output @@ -1,5 +1,5 @@ Warning: Found the same number in a pinnumber attribute and in a net attribute [1] ERROR: Found duplicate pin in net= attributes [5] ERROR: Found duplicate pin in net= attributes [6] -1 warnings found -2 ERRORS found +1 warnings found +2 ERRORS found diff --git a/gsymcheck/tests/duplicate_pinnumber.output b/gsymcheck/tests/duplicate_pinnumber.output index 6802f4b65..67dd87320 100644 --- a/gsymcheck/tests/duplicate_pinnumber.output +++ b/gsymcheck/tests/duplicate_pinnumber.output @@ -1,2 +1,2 @@ ERROR: Found duplicate pinnumber=2 attribute in the symbol -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/duplicate_pinseq.output b/gsymcheck/tests/duplicate_pinseq.output index c790b291e..cbdeac73e 100644 --- a/gsymcheck/tests/duplicate_pinseq.output +++ b/gsymcheck/tests/duplicate_pinseq.output @@ -1,3 +1,3 @@ ERROR: Found duplicate pinseq=1 attribute in the symbol ERROR: Found duplicate pinseq=1 attribute in the symbol -2 ERRORS found +2 ERRORS found diff --git a/gsymcheck/tests/graphical_incorrect.output b/gsymcheck/tests/graphical_incorrect.output index ffd6b0e1a..b0b2820be 100644 --- a/gsymcheck/tests/graphical_incorrect.output +++ b/gsymcheck/tests/graphical_incorrect.output @@ -1,3 +1,3 @@ Warning: Found graphical symbol, device= should be set to none -1 warnings found +1 warnings found No errors found diff --git a/gsymcheck/tests/invalid_slotdef1.output b/gsymcheck/tests/invalid_slotdef1.output index 5f1ff9007..eb8dfdcf0 100644 --- a/gsymcheck/tests/invalid_slotdef1.output +++ b/gsymcheck/tests/invalid_slotdef1.output @@ -1,3 +1,3 @@ ERROR: Invalid slotdef=a attributes, not continuing ERROR: Malformed slotdef= (the format is #:#,#,#,...) -2 ERRORS found +2 ERRORS found diff --git a/gsymcheck/tests/invalid_slotdef2.output b/gsymcheck/tests/invalid_slotdef2.output index f596a6ab6..840bee5d9 100644 --- a/gsymcheck/tests/invalid_slotdef2.output +++ b/gsymcheck/tests/invalid_slotdef2.output @@ -1,3 +1,3 @@ ERROR: Invalid slotdef=a: attributes, not continuing ERROR: Malformed slotdef= (the format is #:#,#,#,...) -2 ERRORS found +2 ERRORS found diff --git a/gsymcheck/tests/invalid_slotdef3.output b/gsymcheck/tests/invalid_slotdef3.output index 553ed3b80..a923b7198 100644 --- a/gsymcheck/tests/invalid_slotdef3.output +++ b/gsymcheck/tests/invalid_slotdef3.output @@ -1,2 +1,2 @@ ERROR: Not enough pins in slotdef=4:12,13 -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/invalid_slotdef4.output b/gsymcheck/tests/invalid_slotdef4.output index cb86106fd..fa07e96cf 100644 --- a/gsymcheck/tests/invalid_slotdef4.output +++ b/gsymcheck/tests/invalid_slotdef4.output @@ -1,2 +1,2 @@ ERROR: Too many pins in slotdef=4:12,13,14,15 -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/labelinside.output b/gsymcheck/tests/labelinside.output index 44eee2314..b7663e06e 100644 --- a/gsymcheck/tests/labelinside.output +++ b/gsymcheck/tests/labelinside.output @@ -1,3 +1,3 @@ Warning: Found obsolete label= attribute: [label=this obsolete] -1 warnings found +1 warnings found No errors found diff --git a/gsymcheck/tests/lots_of_errors.output b/gsymcheck/tests/lots_of_errors.output index 124c03779..3663be9c6 100644 --- a/gsymcheck/tests/lots_of_errors.output +++ b/gsymcheck/tests/lots_of_errors.output @@ -18,5 +18,5 @@ ERROR: Not enough pins in slotdef=2:4,5 ERROR: Slot 8 is larger then the maximum number (5) of slots ERROR: Invalid slotdef=a attributes, not continuing ERROR: Malformed slotdef= (the format is #:#,#,#,...) -12 warnings found -8 ERRORS found +12 warnings found +8 ERRORS found diff --git a/gsymcheck/tests/many_slotdefs.output b/gsymcheck/tests/many_slotdefs.output index 4d196d182..9eb04b102 100644 --- a/gsymcheck/tests/many_slotdefs.output +++ b/gsymcheck/tests/many_slotdefs.output @@ -2,4 +2,4 @@ ERROR: Found 5 slotdef= attributes. Expecting 4 slotdef= attributes ERROR: Slot 5 is larger then the maximum number (4) of slots ERROR: Found 6 slotdef= attributes. Expecting 4 slotdef= attributes ERROR: Slot 6 is larger then the maximum number (4) of slots -4 ERRORS found +4 ERRORS found diff --git a/gsymcheck/tests/misplaced_attributes.output b/gsymcheck/tests/misplaced_attributes.output index 59635987c..52d4b782a 100644 --- a/gsymcheck/tests/misplaced_attributes.output +++ b/gsymcheck/tests/misplaced_attributes.output @@ -9,5 +9,5 @@ ERROR: Found misplaced pin attribute: [pinlabel=not attached] ERROR: Found misplaced pin attribute: [pinseq=3] ERROR: Found misplaced pin attribute: [pinnumber=3] ERROR: Found misplaced pin attribute: [pintype=io] -2 warnings found -9 ERRORS found +2 warnings found +9 ERRORS found diff --git a/gsymcheck/tests/missing_device.output b/gsymcheck/tests/missing_device.output index 6b75008e6..34b424369 100644 --- a/gsymcheck/tests/missing_device.output +++ b/gsymcheck/tests/missing_device.output @@ -1,2 +1,2 @@ ERROR: Missing device= attribute -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/missing_footprint.output b/gsymcheck/tests/missing_footprint.output index e79b8e472..489a4f88d 100644 --- a/gsymcheck/tests/missing_footprint.output +++ b/gsymcheck/tests/missing_footprint.output @@ -1,3 +1,3 @@ Warning: Missing footprint= attribute -1 warnings found +1 warnings found No errors found diff --git a/gsymcheck/tests/missing_numslots.output b/gsymcheck/tests/missing_numslots.output index bf85810e6..b47aa2a43 100644 --- a/gsymcheck/tests/missing_numslots.output +++ b/gsymcheck/tests/missing_numslots.output @@ -1,3 +1,3 @@ Warning: Did not find numslots= attribute, not checking slotting -1 warnings found +1 warnings found No errors found diff --git a/gsymcheck/tests/missing_pinlabel.output b/gsymcheck/tests/missing_pinlabel.output index 5643a1376..85b6622d0 100644 --- a/gsymcheck/tests/missing_pinlabel.output +++ b/gsymcheck/tests/missing_pinlabel.output @@ -1,3 +1,3 @@ Warning: Missing pinlabel= attribute -1 warnings found +1 warnings found No errors found diff --git a/gsymcheck/tests/missing_pinnumber.output b/gsymcheck/tests/missing_pinnumber.output index 5cae60133..83c1b18e2 100644 --- a/gsymcheck/tests/missing_pinnumber.output +++ b/gsymcheck/tests/missing_pinnumber.output @@ -1,2 +1,2 @@ ERROR: Missing pinnumber= attribute -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/missing_pinseq.output b/gsymcheck/tests/missing_pinseq.output index f8eb7dcbe..f73f4df20 100644 --- a/gsymcheck/tests/missing_pinseq.output +++ b/gsymcheck/tests/missing_pinseq.output @@ -1,2 +1,2 @@ ERROR: Missing pinseq= attribute -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/missing_slotdef.output b/gsymcheck/tests/missing_slotdef.output index ff372c7ee..d9de87c33 100644 --- a/gsymcheck/tests/missing_slotdef.output +++ b/gsymcheck/tests/missing_slotdef.output @@ -1,2 +1,2 @@ ERROR: Missing slotdef= (there should be 4 slotdef= attributes) -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/multiple_footprint.output b/gsymcheck/tests/multiple_footprint.output index f54789773..7cd1f0195 100644 --- a/gsymcheck/tests/multiple_footprint.output +++ b/gsymcheck/tests/multiple_footprint.output @@ -1,2 +1,2 @@ ERROR: Multiple footprint= attributes found -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/multiple_pinlabel.output b/gsymcheck/tests/multiple_pinlabel.output index ae67aca5e..4bc535958 100644 --- a/gsymcheck/tests/multiple_pinlabel.output +++ b/gsymcheck/tests/multiple_pinlabel.output @@ -1,2 +1,2 @@ ERROR: Found multiple pinlabel=extra attributes on one pin -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/multiple_pinnumber.output b/gsymcheck/tests/multiple_pinnumber.output index cc3e28f25..1b5b051fc 100644 --- a/gsymcheck/tests/multiple_pinnumber.output +++ b/gsymcheck/tests/multiple_pinnumber.output @@ -1,2 +1,2 @@ ERROR: Found multiple pinnumber=3 attributes on one pin -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/multiple_pinseq.output b/gsymcheck/tests/multiple_pinseq.output index 33808d32c..52f7e67d8 100644 --- a/gsymcheck/tests/multiple_pinseq.output +++ b/gsymcheck/tests/multiple_pinseq.output @@ -1,2 +1,2 @@ ERROR: Found multiple pinseq=3 attributes on one pin -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/multiple_pintype.output b/gsymcheck/tests/multiple_pintype.output index e943692f3..93bafd7b2 100644 --- a/gsymcheck/tests/multiple_pintype.output +++ b/gsymcheck/tests/multiple_pintype.output @@ -1,2 +1,2 @@ ERROR: Found multiple pintype=out attributes on one pin -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/multiple_refdes.output b/gsymcheck/tests/multiple_refdes.output index fc5b657e7..1d289b891 100644 --- a/gsymcheck/tests/multiple_refdes.output +++ b/gsymcheck/tests/multiple_refdes.output @@ -1,2 +1,2 @@ ERROR: Multiple refdes= attributes found -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/nameinside.output b/gsymcheck/tests/nameinside.output index 9077d18d2..2c8b1ded2 100644 --- a/gsymcheck/tests/nameinside.output +++ b/gsymcheck/tests/nameinside.output @@ -1,2 +1,2 @@ ERROR: Found forbidden name= attribute: [name=this a forbidden attribute] -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/nets.output b/gsymcheck/tests/nets.output index b16a333de..9522c0b1c 100644 --- a/gsymcheck/tests/nets.output +++ b/gsymcheck/tests/nets.output @@ -1,2 +1,2 @@ ERROR: Found a net inside a symbol -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/noslots.output b/gsymcheck/tests/noslots.output index bf85810e6..b47aa2a43 100644 --- a/gsymcheck/tests/noslots.output +++ b/gsymcheck/tests/noslots.output @@ -1,3 +1,3 @@ Warning: Did not find numslots= attribute, not checking slotting -1 warnings found +1 warnings found No errors found diff --git a/gsymcheck/tests/old_symbol.output b/gsymcheck/tests/old_symbol.output index b7f967cc7..2411d34e7 100644 --- a/gsymcheck/tests/old_symbol.output +++ b/gsymcheck/tests/old_symbol.output @@ -24,5 +24,5 @@ ERROR: Found old pin#=# attribute: pin1=1 ERROR: Found old slot#=# attribute: slot1=1,2,3 ERROR: Found old slot#=# attribute: slot2=4,5,6 ERROR: Found old slot#=# attribute: slot4=12,13,11 -12 warnings found -14 ERRORS found +12 warnings found +14 ERRORS found diff --git a/gsymcheck/tests/oldpins.output b/gsymcheck/tests/oldpins.output index 1fa195b79..a67f45e6f 100644 --- a/gsymcheck/tests/oldpins.output +++ b/gsymcheck/tests/oldpins.output @@ -10,5 +10,5 @@ ERROR: Missing pinnumber= attribute ERROR: Found old pin#=# attribute: pin3=3 ERROR: Found old pin#=# attribute: pin2=2 ERROR: Found old pin#=# attribute: pin1=1 -3 warnings found -9 ERRORS found +3 warnings found +9 ERRORS found diff --git a/gsymcheck/tests/oldslot.output b/gsymcheck/tests/oldslot.output index 09328bcee..12e48d571 100644 --- a/gsymcheck/tests/oldslot.output +++ b/gsymcheck/tests/oldslot.output @@ -6,5 +6,5 @@ ERROR: Missing slotdef= (there should be 4 slotdef= attributes) ERROR: Found old slot#=# attribute: slot1=1,2,3 ERROR: Found old slot#=# attribute: slot2=4,5,6 ERROR: Found old slot#=# attribute: slot4=12,13,11 -4 warnings found -4 ERRORS found +4 warnings found +4 ERRORS found diff --git a/gsymcheck/tests/pin_offgrid.output b/gsymcheck/tests/pin_offgrid.output index 8642024b5..e8501a377 100644 --- a/gsymcheck/tests/pin_offgrid.output +++ b/gsymcheck/tests/pin_offgrid.output @@ -8,5 +8,5 @@ ERROR: Found offgrid pin at location (x1=410,y1=2800) ERROR: Found offgrid pin at location (x1=400,y1=2420) ERROR: Found offgrid pin at location (x1=404,y1=1204) ERROR: Found offgrid pin at location (x1=400,y1=3204) -5 warnings found -5 ERRORS found +5 warnings found +5 ERRORS found diff --git a/gsymcheck/tests/pintypes.output b/gsymcheck/tests/pintypes.output index c5dae1bc7..40e30fbdb 100644 --- a/gsymcheck/tests/pintypes.output +++ b/gsymcheck/tests/pintypes.output @@ -3,4 +3,4 @@ ERROR: Found multiple pintype=out attributes on one pin ERROR: Invalid pintype=i attribute ERROR: Invalid pintype=iox attribute ERROR: Invalid pintype=abc attribute -5 ERRORS found +5 ERRORS found diff --git a/gsymcheck/tests/typeinside.output b/gsymcheck/tests/typeinside.output index a022cd385..313c8686d 100644 --- a/gsymcheck/tests/typeinside.output +++ b/gsymcheck/tests/typeinside.output @@ -1,2 +1,2 @@ ERROR: Found forbidden type= attribute: [type=this a forbidden attribute] -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/urefinside.output b/gsymcheck/tests/urefinside.output index aa98c9c29..849945351 100644 --- a/gsymcheck/tests/urefinside.output +++ b/gsymcheck/tests/urefinside.output @@ -1,4 +1,4 @@ Warning: Found obsolete uref= attribute: [uref=U?] Warning: Missing refdes= attribute -2 warnings found +2 warnings found No errors found diff --git a/gsymcheck/tests/zero_pinnumber.output b/gsymcheck/tests/zero_pinnumber.output index 48c1b0a22..242752046 100644 --- a/gsymcheck/tests/zero_pinnumber.output +++ b/gsymcheck/tests/zero_pinnumber.output @@ -1,2 +1,2 @@ ERROR: Found pinnumber=0 attribute -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/zero_pinseq.output b/gsymcheck/tests/zero_pinseq.output index d660c9606..27f4553e1 100644 --- a/gsymcheck/tests/zero_pinseq.output +++ b/gsymcheck/tests/zero_pinseq.output @@ -1,2 +1,2 @@ ERROR: Found pinseq=0 attribute -1 ERROR found +1 ERROR found diff --git a/gsymcheck/tests/zero_slotnum.output b/gsymcheck/tests/zero_slotnum.output index 9686c2fe1..24e63c40a 100644 --- a/gsymcheck/tests/zero_slotnum.output +++ b/gsymcheck/tests/zero_slotnum.output @@ -1,3 +1,3 @@ ERROR: Found a zero slot in slotdef=0:4,5,6 ERROR: Malformed slotdef= (the format is #:#,#,#,...) -2 ERRORS found +2 ERRORS found diff --git a/gsymcheck/tests/zero_slots.output b/gsymcheck/tests/zero_slots.output index 6c346a6ef..ab0daa29e 100644 --- a/gsymcheck/tests/zero_slots.output +++ b/gsymcheck/tests/zero_slots.output @@ -1,3 +1,3 @@ ERROR: Found a zero pin in slotdef=1:1,0,3 ERROR: Found a zero pin in slotdef=4:12,13,0 -2 ERRORS found +2 ERRORS found -- 2.11.4.GIT