Skip to content
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

Jump to bottom

Fix ISO C naming violations of function names and header guards #21

Merged
merged 8 commits into from
Jul 1, 2024
Merged

Fix ISO C naming violations of function names and header guards #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d939d67
Update header guards after move of files
bjosv Jun 11, 2024
5126416
Fix ISO-C naming violation in ..SetError()
bjosv Jun 21, 2024
302b1e3
Rename __valkeyClusterGetReplyFromNode()
bjosv Jun 21, 2024
2d69f3d
Rename __valkeyClusterAppendCommand()
bjosv Jun 21, 2024
32a06bf
Remove internal func _valkeyClusterConnect2()
bjosv Jun 21, 2024
0cc4f65
Remove internal func __valkeyClusterGetReply()
bjosv Jun 21, 2024
f76825c
Rename internal func _valkeyClusterConnect()
bjosv Jun 21, 2024
f6622ca
Merge remote-tracking branch 'upstream/main' into iso
bjosv Jul 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
6 changes: 3 additions & 3 deletions include/valkey/sockcompat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef __SOCKCOMPAT_H
#define __SOCKCOMPAT_H
#ifndef VALKEY_SOCKCOMPAT_H
#define VALKEY_SOCKCOMPAT_H

#ifndef _WIN32
/* For POSIX systems we use the standard BSD socket API. */
Expand Down Expand Up @@ -92,4 +92,4 @@ int win32_valkeyKeepAlive(SOCKET sockfd, int interval_ms);
#endif /* VALKEY_SOCKCOMPAT_IMPLEMENTATION */
#endif /* _WIN32 */

#endif /* __SOCKCOMPAT_H */
#endif /* VALKEY_SOCKCOMPAT_H */
6 changes: 3 additions & 3 deletions include/valkey/valkeycluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef __HIRCLUSTER_H
#define __HIRCLUSTER_H
#ifndef VALKEYCLUSTER_H
#define VALKEYCLUSTER_H

#include "async.h"
#include "dict.h"
Expand Down Expand Up @@ -342,4 +342,4 @@ valkeyClusterNode *valkeyClusterGetNodeByKey(valkeyClusterContext *cc,
}
#endif

#endif
#endif /* VALKEYCLUSTER_H */
6 changes: 3 additions & 3 deletions include/valkey/valkeycluster_ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef __HIRCLUSTER_SSL_H
#define __HIRCLUSTER_SSL_H
#ifndef VALKEYCLUSTER_SSL_H
#define VALKEYCLUSTER_SSL_H

#include "valkeycluster.h"
#include "valkey_ssl.h"
Expand All @@ -46,4 +46,4 @@ int valkeyClusterSetOptionEnableSSL(valkeyClusterContext *cc,
}
#endif

#endif /* __HIRCLUSTER_SSL_H */
#endif /* VALKEYCLUSTER_SSL_H */
6 changes: 3 additions & 3 deletions src/adlist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef __ADLIST_H__
#define __ADLIST_H__
#ifndef VALKEY_ADLIST_H
#define VALKEY_ADLIST_H

/* Node, List, and Iterator are the only data structures used currently. */

Expand Down Expand Up @@ -91,4 +91,4 @@ void listRotate(hilist *list);
#define AL_START_HEAD 0
#define AL_START_TAIL 1

#endif /* __ADLIST_H__ */
#endif /* VALKEY_ADLIST_H */
6 changes: 3 additions & 3 deletions src/command.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef __COMMAND_H_
#define __COMMAND_H_
#ifndef VALKEY_COMMAND_H
#define VALKEY_COMMAND_H

#include <stdint.h>

Expand Down Expand Up @@ -84,4 +84,4 @@ void valkey_parse_cmd(struct cmd *r);
struct cmd *command_get(void);
void command_destroy(struct cmd *command);

#endif
#endif /* VALKEY_COMMAND_H */
Loading
Loading