From 564a4fc8471b41fc05bda16e4bbb02a99b515cbf Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Mon, 21 Dec 2020 18:19:37 +0300 Subject: diff-merges: re-arrange functions to match the order they are called in For clarity, define public functions in the order they are called, to make logic inter-dependencies easier to grok. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff-merges.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'diff-merges.c') diff --git a/diff-merges.c b/diff-merges.c index 76c8045797..8325ab8801 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -2,6 +2,10 @@ #include "revision.h" +/* + * Public functions. They are in the order they are called. + */ + void diff_merges_init_revs(struct rev_info *revs) { revs->ignore_merges = -1; @@ -46,16 +50,6 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) return argcount; } -void diff_merges_setup_revs(struct rev_info *revs) -{ - if (revs->combine_merges && revs->ignore_merges < 0) - revs->ignore_merges = 0; - if (revs->ignore_merges < 0) - revs->ignore_merges = 1; - if (revs->combined_all_paths && !revs->combine_merges) - die("--combined-all-paths makes no sense without -c or --cc"); -} - void diff_merges_default_to_first_parent(struct rev_info *revs) { if (revs->ignore_merges < 0) /* No -m */ @@ -72,3 +66,13 @@ void diff_merges_default_to_dense_combined(struct rev_info *revs) } } } + +void diff_merges_setup_revs(struct rev_info *revs) +{ + if (revs->combine_merges && revs->ignore_merges < 0) + revs->ignore_merges = 0; + if (revs->ignore_merges < 0) + revs->ignore_merges = 1; + if (revs->combined_all_paths && !revs->combine_merges) + die("--combined-all-paths makes no sense without -c or --cc"); +} -- cgit v1.2.3 ' value='caaaf123f38d1a9bb8dbcfd711a063d96e284fe9'/>
path: root/drivers/net/hamradio/soundmodem/sm.c (unfollow)
AgeCommit message (Expand)AuthorFilesLines
2002-10-27[PATCH] IDE floppy must be marked removableAlan Cox1-0/+1
2002-10-27[PATCH] fix IDE compile with SIS5513Alan Cox1-8/+9
2002-10-27[PATCH] move siimage to pci_get/setAlan Cox1-4/+4
2002-10-27[PATCH] move hpt366 to pci_getAlan Cox1-5/+5
2002-10-27[PATCH] remove tqueue.h from vme_scAlan Cox1-1/+0
2002-10-27[PATCH] update the qic02 tape driver to 2.5.44Alan Cox1-432/+267
2002-10-27[PATCH] move stallion to workqueueAlan Cox1-3/+2
2002-10-27[PATCH] stallion workqueueAlan Cox1-2/+1
2002-10-27[PATCH] kill tqueue in specialixAlan Cox1-1/+0
2002-10-27[PATCH] move ip2 to workqueuesAlan Cox2-14/+11
2002-10-27[PATCH] update i810 tco to C99Alan Cox1-11/+11
2002-10-27[PATCH] make bluetooth compile againAlan Cox2-12/+12
2002-10-27[PATCH] kill tqueue in dzAlan Cox1-1/+0
2002-10-27[PATCH] make gscd compile againAlan Cox1-1/+1
2002-10-27[PATCH] xd_open is goneAlan Cox1-1/+0
2002-10-27[PATCH] fix umem driver to use pci_get/set..Alan Cox1-8/+3
2002-10-27[PATCH] merge befs file system from 2.4 (no core changes)Alan Cox23-1/+3940
2002-10-27[PATCH] get the right thing out of se401 on gcc 3.2Alan Cox1-2/+4
2002-10-27[PATCH] update qlogicfas driverAlan Cox2-273/+388
2002-10-27[PATCH] correct notes on scsi generic releaseAlan Cox1-2/+2
2002-10-27[PATCH] SCSI configure helpAlan Cox1-8/+21
2002-10-27[PATCH] next NCR5380 updatesAlan Cox15-537/+507
2002-10-27[PATCH] u14-34f update from maintainerAlan Cox2-18/+48
2002-10-27[PATCH] finish updating sym53c416Alan Cox2-25/+47
2002-10-27[PATCH] nsp_cs update from maintainerAlan Cox5-291/+722
2002-10-27[PATCH] fix scsi irq errors on seagateAlan Cox2-0/+9
2002-10-27[PATCH] nsp32 needs updating for scsi_hn_getAlan Cox1-5/+3
2002-10-27[PATCH] resurrect the NCR53c406aAlan Cox2-806/+777
2002-10-27[PATCH] ncr53c8xxx needs updating for scsi_hn_getAlan Cox1-9/+4
2002-10-27[PATCH] inia100 just has to lose a next: NULLAlan Cox1-2/+1
2002-10-27[PATCH] fix all the IRQ breakage on the in2000Alan Cox2-14/+13
2002-10-27[PATCH] initial eata driver updatesAlan Cox4-88/+216
2002-10-27[PATCH] fix aic7xxx on gcc 3.2 warning spewAlan Cox1-20/+20
2002-10-27[PATCH] move advansys from pcibios to pci_Alan Cox1-23/+11
2002-10-27[PATCH] ressurect the aha1740 driverAlan Cox1-12/+19
2002-10-27[PATCH] move 53c7,8xx to pci_ not pcibiosAlan Cox2-11/+7
2002-10-27[PATCH] small scsi compile fixesAlan Cox7-24/+15
2002-10-27[PATCH] MCA bus basic cleanupsAlan Cox8-1540/+1323
2002-10-18Linux v2.5.44v2.5.44Linus Torvalds1-1/+1
2002-10-18[PATCH] device removalPatrick Mochel2-3/+4