-
Notifications
You must be signed in to change notification settings - Fork 211
PHPC-349: Fixes and code cleanup #568
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Almost OK, just two questions.
php_phongo_structs.h
Outdated
| mongoc_client_t *client; | ||
| char *command_name; | ||
| uint32_t server_id; | ||
| int server_id; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is curious. For some of the event_ts we use int, and sometimes uint32_t for this. One of them is right...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The server and cursor structs use int. I'm not sure where uint32_t came from.
I believe this is only a diff because I re-ordered the struct definitions to be alphabetical; however, it'd be a good idea to make them consistent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you fix this one in your PR so I can merge it cleanly then?
| #ifndef PHONGO_MONITORING_H | ||
| #define PHONGO_MONITORING_H | ||
|
|
||
| #include <php.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you add this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
php.h is where PHP_FUNCTION() is defined. This wasn't an error before as you generally have php.h included before this file, but I considered it good practice to have headers include their dependencies.
php_phongo_structs.h
Outdated
| mongoc_client_t *client; | ||
| char *command_name; | ||
| uint32_t server_id; | ||
| int server_id; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you fix this one in your PR so I can merge it cleanly then?
|
These last two commits made Travis unhappy... |
Related to: #466