Skip to content

Spring cleaning#148

Merged
aejsmith merged 15 commits intoFeralInteractive:masterfrom
mdiluz:the-big-cleanup
Jun 1, 2019
Merged

Spring cleaning#148
aejsmith merged 15 commits intoFeralInteractive:masterfrom
mdiluz:the-big-cleanup

Conversation

@mdiluz
Copy link
Copy Markdown
Contributor

@mdiluz mdiluz commented May 25, 2019

  • README restructure and cleanup
  • Source file rename and restructure
  • Wine code full separation into wine file
  • Include cleanup
  • Comment cleanup

@mdiluz mdiluz force-pushed the the-big-cleanup branch 2 times, most recently from 8021c98 to 598bd8e Compare May 26, 2019 11:11

#pragma once
#include "daemon_config.h"
#define CONFIG_VALUE_MAX 256
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the duplicated definition?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To split out the dependency between common and daemon code.

But yeah, it's a bit confusing now, I'll clean it up.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in d9b9141

*/
static GameModeClient *game_mode_client_new(pid_t pid, char *executable)
{
/* clang-format off */
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed (and the other one)? These are in my preferred style already but is it not possible to get clang-format to do this?

Copy link
Copy Markdown
Contributor Author

@mdiluz mdiluz Jun 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% sure why but on multiple different installs, clang reformats these two sections differently to the Travis instance the CI is running. I've tried to coax it into doing it correctly with options but nothing seems to work.

I'm put comments in 83e352b to explain. I think it's just a clang-format bug of some kind.

@aejsmith
Copy link
Copy Markdown
Contributor

Added a couple of comments, and can you rebase on master since there are now conflicts?

@mdiluz mdiluz force-pushed the the-big-cleanup branch 2 times, most recently from 0dbbc55 to 681c5b5 Compare June 1, 2019 10:11
	Leave a static assert to ensure they're in sync when relevant in gamemode-gpu
@mdiluz mdiluz force-pushed the the-big-cleanup branch from 681c5b5 to d9b9141 Compare June 1, 2019 10:12
@mdiluz
Copy link
Copy Markdown
Contributor Author

mdiluz commented Jun 1, 2019

Rebased and addressed comments

@aejsmith aejsmith merged commit fddd08c into FeralInteractive:master Jun 1, 2019
afayaz-feral pushed a commit that referenced this pull request May 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants