ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 18:49:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'insp3' into master.

Browse Source
This commit is contained in:
Sadie Powell 2019-08-13 15:43:26 +01:00
commit aca4503481
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.mailmap
View File

@ -1,5 +1,6 @@
Adam <Adam@anope.org> Adam <adam@inspircd.org>
Adam <Adam@anope.org> Adam <adam@sigterm.info>
Attila Molnar <attilamolnar@hush.com> Attila Molnar <am63770@gmail.com>
Attila Molnar <attilamolnar@hush.com> attilamolnar <am63770@gmail.com>
Attila Molnar <attilamolnar@hush.com> attilamolnar <attilamolnar@hush.com>
blitmap <blitternet@gmail.com> Pogs McPoggerson <sir.pogsalot@gmail.com>
@ -11,17 +12,26 @@ Craig Edwards <brain@inspircd.org> brain <brain@e03df62e-2008-0410-955
Craig Edwards <brain@inspircd.org> root <root@e03df62e-2008-0410-955e-edbf42e46eb7>
Craig McLure <craig@frostycoolslug.com> frostycoolslug <frostycoolslug@e03df62e-2008-0410-955e-edbf42e46eb7>
Daniel De Graaf <danieldg@inspircd.org> danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Daniel Vassdal <shutter@canternet.org> Daniel Vassdal <daniel@Daniel-Debian>
Daniel Vassdal <shutter@canternet.org> Daniel Vassdal <daniel@daniel-VirtualBox.(none)>
Daniel Vassdal <shutter@canternet.org> Daniel Vassdal <daniel@ubuntu.(none)>
Daniel Vassdal <shutter@canternet.org> Daniel Vassdal <daniel@vassdal.org>
Daniel Vassdal <shutter@canternet.org> ShutterQuick <shutter@canternet.org>
Dennis Friis <peavey@inspircd.org> peavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>
DjSlash <djslash@djslash.org> Rutger <djslash+github@djslash.org>
Geoff Bricker <geoff.bricker@gmail.com> bricker <bricker@e03df62e-2008-0410-955e-edbf42e46eb7>
iwalkalone <iwalkalone69@gmail.com> iwalkalone <iwalkalone69@users.noreply.github.com>
jackmcbarn <jackmcbarn@inspircd.org> Jackmcbarn <jackmcbarn@jackmcbarn.no-ip.org>
James Lu <GLolol@overdrivenetworks.com> James Lu <GLolol1@hotmail.com>
John Brooks <special@inspircd.org> special <special@e03df62e-2008-0410-955e-edbf42e46eb7>
Justin Crawford <Justasic@Gmail.com> Justasic <Justasic@gmail.com>
linuxdaemon <linuxdaemon.irc@gmail.com> linuxdaemon <linuxdaemon@snoonet.org>
linuxdaemon <linuxdaemon.irc@gmail.com> linuxdaemon <linuxdaemon@users.noreply.github.com>
Matt Smith <dz@inspircd.org> dz <dz@e03df62e-2008-0410-955e-edbf42e46eb7>
md_5 <git@md-5.net> md-5 <md-5@users.noreply.github.com>
Oliver Lupton <om@inspircd.org> om <om@e03df62e-2008-0410-955e-edbf42e46eb7>
Pippijn van Steenhoven <pip88nl@gmail.com> pippijn <pippijn@e03df62e-2008-0410-955e-edbf42e46eb7>
Robby <robby@chatbelgie.be> Robby <Robby-@users.noreply.github.com>
Robby <robby@chatbelgie.be> Robby- <robby@chat.be>
Robby <robby@chatbelgie.be> Robby- <robbyke@gmail.com>
Robin Burchell <robin+git@viroteck.net> Robin Burchell <viroteck@viroteck.net>

9
include/extensible.h
View File

@ -193,22 +193,19 @@ class SimpleExtItem : public ExtensionItem
{
T* ptr = new T(value);
T* old = static_cast<T*>(set_raw(container, ptr));
Del del;
del(old);
free(container, old);
}
inline void set(Extensible* container, T* value)
{
T* old = static_cast<T*>(set_raw(container, value));
Del del;
del(old);
free(container, old);
}
inline void unset(Extensible* container)
{
T* old = static_cast<T*>(unset_raw(container));
Del del;
del(old);
free(container, old);
}
void free(Extensible* container, void* item) override

4
src/base.cpp
View File

@ -335,13 +335,13 @@ void StringExtItem::FromNetwork(Extensible* container, const std::string& value)
void StringExtItem::set(Extensible* container, const std::string& value)
{
void* old = set_raw(container, new std::string(value));
delete static_cast<std::string*>(old);
free(container, old);
}
void StringExtItem::unset(Extensible* container)
{
void* old = unset_raw(container);
delete static_cast<std::string*>(old);
free(container, old);
}
void StringExtItem::free(Extensible* container, void* item)