Code (style) cleanup patches

Collapse
X
 
  • Time
  • Show
Clear All
new posts
  • calris
    Adept
    • Mar 2016
    • 194

    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.
  • Nick
    Vanilla maintainer
    • Apr 2007
    • 9647

    #2
    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.

    Comment

    • calris
      Adept
      • Mar 2016
      • 194

      #3
      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

      Comment

      • Nick
        Vanilla maintainer
        • Apr 2007
        • 9647

        #4
        Originally posted by calris
        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.

        Comment

        • Nick
          Vanilla maintainer
          • Apr 2007
          • 9647

          #5
          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.

          Comment

          • calris
            Adept
            • Mar 2016
            • 194

            #6
            Originally posted by Nick
            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

            Comment

            Working...
            😀
            😂
            🥰
            😘
            🤢
            😎
            😞
            😡
            👍
            👎