You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
785 B
24 lines
785 B
7 years ago
|
From 61dd027666b40102bc9463217264f1deaab4cc8a Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Tue, 3 Mar 2015 00:05:14 -0500
|
||
|
|
Subject: [PATCH] bus-proxyd: avoid logging oom twice
|
||
|
|
|
||
|
|
(cherry picked from commit c29005212dc38d98c707639d1a82ffa5270f2e97)
|
||
|
|
---
|
||
|
|
src/bus-proxyd/bus-proxyd.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
|
||
|
|
index b6b005636..b6550ed3c 100644
|
||
|
|
--- a/src/bus-proxyd/bus-proxyd.c
|
||
|
|
+++ b/src/bus-proxyd/bus-proxyd.c
|
||
|
|
@@ -82,7 +82,7 @@ static int client_context_new(ClientContext **out) {
|
||
|
|
|
||
|
|
c = new0(ClientContext, 1);
|
||
|
|
if (!c)
|
||
|
|
- return log_oom();
|
||
|
|
+ return -ENOMEM;
|
||
|
|
|
||
|
|
c->fd = -1;
|
||
|
|
|