Skip to content

Delete unused declaration. #400

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 1, 2024
Merged

Delete unused declaration. #400

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb8d5ef
Delete unused declaration.
zhulipeng Apr 29, 2024
0337939
Revert macro renaming.
zhulipeng May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/dict.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef __DICT_H
#define __DICT_H
#ifndef DICT_H
#define DICT_H
Copy link
Member

@madolson madolson Apr 30, 2024

Choose a reason for hiding this comment

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

Why rename this? It's a fairly common pattern in other code. I'm not sure if there is a strong reason to change it.

Copy link
Member Author

@zhulipeng zhulipeng Apr 30, 2024

Choose a reason for hiding this comment

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

I remember @zuiderkwast requested such similar renaming because the leading double underscore which is a reserved name by the C standard.

Copy link
Contributor

@zuiderkwast zuiderkwast Apr 30, 2024

Choose a reason for hiding this comment

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

I mostly meant that when we're anyway renaming things like __REDIS_XYZ, we can drop the leading underscores at the same time.

I don't think we want do it all over the code base. (Sorry if I said that.)

Copy link
Member

@madolson madolson Apr 30, 2024

Choose a reason for hiding this comment

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

What's the motivation to drop the leading underscores? It's just a little bit less consistent now.

Copy link
Contributor

@zuiderkwast zuiderkwast Apr 30, 2024

Choose a reason for hiding this comment

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

They're reserved names in C.

https://www.gnu.org/software/libc/manual/html_node/Reserved-Names.html

Copy link
Contributor

@zuiderkwast zuiderkwast Apr 30, 2024

Choose a reason for hiding this comment

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

I don't think it will ever be a problem, unless name macros __ARM or something like that.

If you prefer to keep double underscores for consistency, I can accept that.

Copy link
Contributor

@zuiderkwast zuiderkwast Apr 30, 2024

Choose a reason for hiding this comment

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

@lipzhu Please revert back to __DICT_H. If we ever want to change all these reserved names (for some kind of validator in the future) we can fix all files at the same time.

Copy link
Member

@madolson madolson Apr 30, 2024

Choose a reason for hiding this comment

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

If you prefer to keep double underscores for consistency, I can accept that.

I had read that reserved-names doc multiple times, and never noticed __ clause. I would prefer we keep what we have (since there isn't a conflict), but moving forward use the style that we mentioned here.

Copy link
Contributor

@zuiderkwast zuiderkwast May 1, 2024

Choose a reason for hiding this comment

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

In case you still didn't find it:

In addition to the names documented in this manual, reserved names include all external identifiers (global functions and variables) that begin with an underscore (‘_’) and all identifiers regardless of use that begin with either two underscores or an underscore followed by a capital letter are reserved names.


#include "mt19937-64.h"
#include <limits.h>
Expand Down Expand Up @@ -210,7 +210,6 @@ void dictSetDoubleVal(dictEntry *de, double val);
int64_t dictIncrSignedIntegerVal(dictEntry *de, int64_t val);
uint64_t dictIncrUnsignedIntegerVal(dictEntry *de, uint64_t val);
double dictIncrDoubleVal(dictEntry *de, double val);
void *dictEntryMetadata(dictEntry *de);
void *dictGetKey(const dictEntry *de);
void *dictGetVal(const dictEntry *de);
int64_t dictGetSignedIntegerVal(const dictEntry *de);
Expand Down Expand Up @@ -253,4 +252,4 @@ void dictFreeStats(dictStats *stats);
int dictTest(int argc, char *argv[], int flags);
#endif

#endif /* __DICT_H */
#endif /* DICT_H */