Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd Simplify.



details:   https://anonhg.NetBSD.org/src/rev/f5c827dfe911
branches:  trunk
changeset: 340239:f5c827dfe911
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Aug 28 13:04:48 2015 +0000

description:
Simplify.

diffstat:

 external/bsd/libevent/dist/test/regress_buffer.c |  6 +++---
 external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c   |  2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r abe29527eda6 -r f5c827dfe911 external/bsd/libevent/dist/test/regress_buffer.c
--- a/external/bsd/libevent/dist/test/regress_buffer.c  Fri Aug 28 13:04:29 2015 +0000
+++ b/external/bsd/libevent/dist/test/regress_buffer.c  Fri Aug 28 13:04:48 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: regress_buffer.c,v 1.4 2015/01/29 07:26:02 spz Exp $   */
+/*     $NetBSD: regress_buffer.c,v 1.5 2015/08/28 13:04:48 joerg Exp $ */
 /*
  * Copyright (c) 2003-2007 Niels Provos <provos%citi.umich.edu@localhost>
  * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
@@ -33,7 +33,7 @@
 
 #include "event2/event-config.h"
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: regress_buffer.c,v 1.4 2015/01/29 07:26:02 spz Exp $");
+__RCSID("$NetBSD: regress_buffer.c,v 1.5 2015/08/28 13:04:48 joerg Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -199,7 +199,7 @@
 
        tt_assert(evbuffer_get_length(evb_two) == 0);
        tt_assert(evbuffer_get_length(evb) == 7);
-       tt_assert(!memcmp((char*)EVBUFFER_DATA(evb), "1/hello", 7) != 0);
+       tt_assert(memcmp((char*)EVBUFFER_DATA(evb), "1/hello", 7) == 0);
 
        memset(buffer, 0, sizeof(buffer));
        evbuffer_add(evb, buffer, sizeof(buffer));
diff -r abe29527eda6 -r f5c827dfe911 external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c
--- a/external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c    Fri Aug 28 13:04:29 2015 +0000
+++ b/external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c    Fri Aug 28 13:04:48 2015 +0000
@@ -3805,7 +3805,7 @@
        if (ctrl_ifname == NULL)
                ctrl_ifname = wpa_cli_get_default_ifname();
 
-       if (!wpa_cli_open_connection(ctrl_ifname, 1) == 0) {
+       if (wpa_cli_open_connection(ctrl_ifname, 1) != 0) {
                if (!warning_displayed) {
                        printf("Could not connect to wpa_supplicant: "
                               "%s - re-trying\n",



Home | Main Index | Thread Index | Old Index