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

Bug 5343: Fix remaining GCC v14 build issues #1673

Closed
wants to merge 5 commits into from
Closed

Bug 5343: Fix remaining GCC v14 build issues #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7080c9e
Fix undefined std::find
yadij Feb 13, 2024
906884b
Fix error: 'InstanceId<...>::InstanceId(const InstanceId<...> &)' is …
yadij Feb 13, 2024
2631e20
Fix error: ‘void* calloc(size_t, size_t)’ sizes
yadij Feb 13, 2024
535606d
Update src/base/InstanceId.h
yadij Feb 13, 2024
066d01a
Merge branch 'master' into bug5343-gcc14
yadij Feb 14, 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
2 changes: 1 addition & 1 deletion src/auth/basic/LDAP/basic_ldap_auth.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ readSecret(const char *filename)
if ((e = strrchr(buf, '\r')))
*e = 0;

passwd = (char *) calloc(sizeof(char), strlen(buf) + 1);
passwd = static_cast<char *>(calloc(strlen(buf) + 1, sizeof(char)));
if (!passwd) {
fprintf(stderr, PROGRAM_NAME " ERROR: can not allocate memory\n");
exit(EXIT_FAILURE);
Expand Down
2 changes: 1 addition & 1 deletion src/auth/digest/eDirectory/edir_ldapext.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

#define NMAS_LDAP_EXT_VERSION 1

#define SMB_MALLOC_ARRAY(type, nelem) calloc(sizeof(type), nelem)
#define SMB_MALLOC_ARRAY(type, nelem) calloc(nelem, sizeof(type))
#define DEBUG(level, args)

/**********************************************************************
Expand Down
5 changes: 1 addition & 4 deletions src/base/InstanceId.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class InstanceId
typedef ValueType Value; ///< id storage type

InstanceId() {change();}
InstanceId(InstanceId &&) = delete; // no copying/moving of any kind

operator Value() const { return value; }
bool operator ==(const InstanceId &o) const { return value == o.value; }
Expand All @@ -67,10 +68,6 @@ class InstanceId

public:
Value value = Value(); ///< instance identifier

private:
InstanceId(const InstanceId &); ///< not implemented; IDs are unique
InstanceId& operator=(const InstanceId &); ///< not implemented
};

/// An InstanceIdDefinitions() helper. Avoid direct use.
Expand Down
Loading