summaryrefslogtreecommitdiff
path: root/src/event
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-28 23:58:17 +0100
committerMax Kellermann <max@duempel.org>2013-10-28 23:58:17 +0100
commit20597b3632d3b6e25ba532716106f90d5b64d0e8 (patch)
treefa6dabaff127150caf3cf4723257f15ef2c3e0f8 /src/event
parent4728735acf20fba24d0d03ab431160e250325869 (diff)
*: use nullptr instead of NULL
Diffstat (limited to 'src/event')
-rw-r--r--src/event/Loop.cxx2
-rw-r--r--src/event/ServerSocket.hxx6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/event/Loop.cxx b/src/event/Loop.cxx
index e8d9e4b96..665dfa500 100644
--- a/src/event/Loop.cxx
+++ b/src/event/Loop.cxx
@@ -230,7 +230,7 @@ guint
EventLoop::AddIdle(GSourceFunc function, gpointer data)
{
GSource *source = g_idle_source_new();
- g_source_set_callback(source, function, data, NULL);
+ g_source_set_callback(source, function, data, nullptr);
guint id = g_source_attach(source, GetContext());
g_source_unref(source);
return id;
diff --git a/src/event/ServerSocket.hxx b/src/event/ServerSocket.hxx
index a4ca2d96d..6143d273a 100644
--- a/src/event/ServerSocket.hxx
+++ b/src/event/ServerSocket.hxx
@@ -75,7 +75,7 @@ public:
* Add a listener on a port on all interfaces.
*
* @param port the TCP port
- * @param error_r location to store the error occurring, or NULL to
+ * @param error_r location to store the error occurring, or nullptr to
* ignore errors
* @return true on success
*/
@@ -87,7 +87,7 @@ public:
*
* @param hostname the host name to be resolved
* @param port the TCP port
- * @param error_r location to store the error occurring, or NULL to
+ * @param error_r location to store the error occurring, or nullptr to
* ignore errors
* @return true on success
*/
@@ -97,7 +97,7 @@ public:
* Add a listener on a Unix domain socket.
*
* @param path the absolute socket path
- * @param error_r location to store the error occurring, or NULL to
+ * @param error_r location to store the error occurring, or nullptr to
* ignore errors
* @return true on success
*/