Angband.oook.cz
Angband.oook.cz
AboutVariantsLadderForumCompetitionComicScreenshotsFunniesLinks

Go Back   Angband Forums > Angband > Development

Reply
 
Thread Tools Display Modes
Old April 21, 2016, 14:01   #1
calris
Adept
 
Join Date: Mar 2016
Posts: 194
calris is on a distinguished road
Code (style) cleanup patches

Nick,

I've created a new branch in my github repo which I'm dumping code cleanup patches into
here

These are only coding style cleanups - no code modifications (except for removing some typedefs)

I've used the cleanfile and checkpatch.pl scripts from the Linux kernel source. I've got no particular desire to 'force' Linux kernel coding style into the Angband source, but it's a well documented style and checkpatch.pl is really good at homing in on style violations.

So far I've done a global whitespace cleanup and a style cleanup of the z-* files.
calris is offline   Reply With Quote
Old April 21, 2016, 15:07   #2
Nick
Vanilla maintainer
 
Nick's Avatar
 
Join Date: Apr 2007
Location: Canberra, Australia
Age: 54
Posts: 7,849
Donated: $60
Nick will become famous soon enough
Thanks, I will pull those in at some point.
__________________
One for the Dark Lord on his dark throne
In the Land of Mordor where the Shadows lie.
Nick is offline   Reply With Quote
Old April 22, 2016, 09:50   #3
calris
Adept
 
Join Date: Mar 2016
Posts: 194
calris is on a distinguished road
Just pushed cleanups to cmd-*

Unlike the previous patches (and as suggested by takkaria) I didn't remove typedefs - this prevented the patch from polluting non cmd-* source file.

I'll keep posting to this thread as I push more patches into https://github.com/calris/angband/tree/code-cleanup

Nick, let me know what your preferred option is regarding conflicts - I'm sure things will get messy when you start to merge in the Rune ID and traps feature branches
calris is offline   Reply With Quote
Old April 22, 2016, 12:26   #4
Nick
Vanilla maintainer
 
Nick's Avatar
 
Join Date: Apr 2007
Location: Canberra, Australia
Age: 54
Posts: 7,849
Donated: $60
Nick will become famous soon enough
Quote:
Originally Posted by calris View Post
Nick, let me know what your preferred option is regarding conflicts - I'm sure things will get messy when you start to merge in the Rune ID and traps feature branches
At this point, my plan is
  1. Do some bugfixes on the ID branch
  2. Pull it into master
  3. Pull in the patches you have done by that time one by one, fixing the (many, I assume) conflicts as I go
  4. Rebase the traps branch onto master, fixing conflicts again

If after step 3 you patch against the new master, we should be good
__________________
One for the Dark Lord on his dark throne
In the Land of Mordor where the Shadows lie.
Nick is offline   Reply With Quote
Old April 23, 2016, 10:54   #5
Nick
Vanilla maintainer
 
Nick's Avatar
 
Join Date: Apr 2007
Location: Canberra, Australia
Age: 54
Posts: 7,849
Donated: $60
Nick will become famous soon enough
Change of plan.

1 and 2 are done, but given the discussion going on in the Angband Coding Style thread, I think it might be worth waiting before pulling in anything from this branch.
__________________
One for the Dark Lord on his dark throne
In the Land of Mordor where the Shadows lie.
Nick is offline   Reply With Quote
Old April 24, 2016, 04:33   #6
calris
Adept
 
Join Date: Mar 2016
Posts: 194
calris is on a distinguished road
Quote:
Originally Posted by Nick View Post
Change of plan.

1 and 2 are done, but given the discussion going on in the Angband Coding Style thread, I think it might be worth waiting before pulling in anything from this branch.
I wholeheartedly agree
calris is offline   Reply With Quote
Reply


Currently Active Users Viewing This Thread: 1 (0 members and 1 guests)
 
Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump

Similar Threads
Thread Thread Starter Forum Replies Last Post
graphic-style Tibarius Vanilla 2 January 21, 2015 15:47
O style combat fizzix Vanilla 0 September 26, 2011 21:49
Ranger play style tony Vanilla 5 June 16, 2011 20:05
TortoiseSVN - doing diffs and making patches PaulBlay Idle chatter 0 February 22, 2009 21:09
3.1-dev: Call for bugs and patches takkaria Vanilla 17 January 7, 2009 17:42


All times are GMT +1. The time now is 09:23.


Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2019, vBulletin Solutions Inc.