projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header
[platform/upstream/glib.git]
/
gio
/
ginetaddressmask.c
diff --git
a/gio/ginetaddressmask.c
b/gio/ginetaddressmask.c
index
0e2404d
..
f717c77
100644
(file)
--- a/
gio/ginetaddressmask.c
+++ b/
gio/ginetaddressmask.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
*/
#include <config.h>
@@
-33,6
+31,7
@@
/**
* SECTION:ginetaddressmask
* @short_description: An IPv4/IPv6 address mask
/**
* SECTION:ginetaddressmask
* @short_description: An IPv4/IPv6 address mask
+ * @include: gio/gio.h
*
* #GInetAddressMask represents a range of IPv4 or IPv6 addresses
* described by a base address and a length indicating how many bits
*
* #GInetAddressMask represents a range of IPv4 or IPv6 addresses
* described by a base address and a length indicating how many bits
@@
-237,7
+236,7
@@
g_inet_address_mask_initable_iface_init (GInitableIface *iface)
static void
g_inet_address_mask_init (GInetAddressMask *mask)
{
static void
g_inet_address_mask_init (GInetAddressMask *mask)
{
- mask->priv = g_inet_address_mask_get_private (mask);
+ mask->priv = g_inet_address_mask_get_
instance_
private (mask);
}
/**
}
/**
@@
-331,7
+330,7
@@
g_inet_address_mask_new_from_string (const gchar *mask_string,
*
* Converts @mask back to its corresponding string form.
*
*
* Converts @mask back to its corresponding string form.
*
- * Return
value
: a string corresponding to @mask.
+ * Return
s
: a string corresponding to @mask.
*
* Since: 2.32
*/
*
* Since: 2.32
*/
@@
-359,7
+358,7
@@
g_inet_address_mask_to_string (GInetAddressMask *mask)
*
* Gets the #GSocketFamily of @mask's address
*
*
* Gets the #GSocketFamily of @mask's address
*
- * Return
value
: the #GSocketFamily of @mask's address
+ * Return
s
: the #GSocketFamily of @mask's address
*
* Since: 2.32
*/
*
* Since: 2.32
*/
@@
-377,7
+376,7
@@
g_inet_address_mask_get_family (GInetAddressMask *mask)
*
* Gets @mask's base address
*
*
* Gets @mask's base address
*
- * Return
value
: (transfer none): @mask's base address
+ * Return
s
: (transfer none): @mask's base address
*
* Since: 2.32
*/
*
* Since: 2.32
*/
@@
-395,7
+394,7
@@
g_inet_address_mask_get_address (GInetAddressMask *mask)
*
* Gets @mask's length
*
*
* Gets @mask's length
*
- * Return
value
: @mask's length
+ * Return
s
: @mask's length
*
* Since: 2.32
*/
*
* Since: 2.32
*/
@@
-414,7
+413,7
@@
g_inet_address_mask_get_length (GInetAddressMask *mask)
*
* Tests if @address falls within the range described by @mask.
*
*
* Tests if @address falls within the range described by @mask.
*
- * Return
value
: whether @address falls within the range described by
+ * Return
s
: whether @address falls within the range described by
* @mask.
*
* Since: 2.32
* @mask.
*
* Since: 2.32
@@
-458,7
+457,7
@@
g_inet_address_mask_matches (GInetAddressMask *mask,
*
* Tests if @mask and @mask2 are the same mask.
*
*
* Tests if @mask and @mask2 are the same mask.
*
- * Return
value
: whether @mask and @mask2 are the same mask
+ * Return
s
: whether @mask and @mask2 are the same mask
*
* Since: 2.32
*/
*
* Since: 2.32
*/
@@
-466,6
+465,9
@@
gboolean
g_inet_address_mask_equal (GInetAddressMask *mask,
GInetAddressMask *mask2)
{
g_inet_address_mask_equal (GInetAddressMask *mask,
GInetAddressMask *mask2)
{
+ g_return_val_if_fail (G_IS_INET_ADDRESS_MASK (mask), FALSE);
+ g_return_val_if_fail (G_IS_INET_ADDRESS_MASK (mask2), FALSE);
+
return ((mask->priv->length == mask2->priv->length) &&
g_inet_address_equal (mask->priv->addr, mask2->priv->addr));
}
return ((mask->priv->length == mask2->priv->length) &&
g_inet_address_equal (mask->priv->addr, mask2->priv->addr));
}