utils: remove custom g_ptr_array_find_with_equal_func()
This was required when building with GLib < 2.54, but we now require 2.56 as minimum, so it is no longer needed.
This commit is contained in:
@@ -306,7 +306,7 @@ ModemManager_SOURCES = \
|
|||||||
main.c \
|
main.c \
|
||||||
mm-context.h \
|
mm-context.h \
|
||||||
mm-context.c \
|
mm-context.c \
|
||||||
mm-utils.h mm-utils.c \
|
mm-utils.h \
|
||||||
mm-private-boxed-types.h \
|
mm-private-boxed-types.h \
|
||||||
mm-private-boxed-types.c \
|
mm-private-boxed-types.c \
|
||||||
mm-auth-provider.h \
|
mm-auth-provider.h \
|
||||||
|
@@ -1,47 +0,0 @@
|
|||||||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details:
|
|
||||||
*
|
|
||||||
* Singleton support imported from NetworkManager.
|
|
||||||
* (C) Copyright 2014 Red Hat, Inc.
|
|
||||||
*
|
|
||||||
* GPtrArray lookup with GEqualFunc imported from GLib 2.48
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "mm-utils.h"
|
|
||||||
|
|
||||||
#if !GLIB_CHECK_VERSION(2,54,0)
|
|
||||||
|
|
||||||
gboolean
|
|
||||||
mm_ptr_array_find_with_equal_func (GPtrArray *haystack,
|
|
||||||
gconstpointer needle,
|
|
||||||
GEqualFunc equal_func,
|
|
||||||
guint *index_)
|
|
||||||
{
|
|
||||||
guint i;
|
|
||||||
|
|
||||||
g_return_val_if_fail (haystack != NULL, FALSE);
|
|
||||||
|
|
||||||
if (equal_func == NULL)
|
|
||||||
equal_func = g_direct_equal;
|
|
||||||
|
|
||||||
for (i = 0; i < haystack->len; i++) {
|
|
||||||
if (equal_func (g_ptr_array_index (haystack, i), needle)) {
|
|
||||||
if (index_ != NULL)
|
|
||||||
*index_ = i;
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
@@ -80,16 +80,4 @@
|
|||||||
} \
|
} \
|
||||||
MM_DEFINE_SINGLETON_DESTRUCTOR(TYPE)
|
MM_DEFINE_SINGLETON_DESTRUCTOR(TYPE)
|
||||||
|
|
||||||
|
|
||||||
#if !GLIB_CHECK_VERSION(2,54,0)
|
|
||||||
|
|
||||||
/* Pointer Array lookup with a GEqualFunc, imported from GLib 2.54 */
|
|
||||||
#define g_ptr_array_find_with_equal_func mm_ptr_array_find_with_equal_func
|
|
||||||
gboolean mm_ptr_array_find_with_equal_func (GPtrArray *haystack,
|
|
||||||
gconstpointer needle,
|
|
||||||
GEqualFunc equal_func,
|
|
||||||
guint *index_);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* MM_UTILS_H */
|
#endif /* MM_UTILS_H */
|
||||||
|
Reference in New Issue
Block a user