From: Guido van Rossum <guido@python.org>
Date: Fri, 5 Nov 1993 10:18:44 +0000 (+0000)
Subject: Added getmappingsize().  (Needed by previous checkin of posixmodule.c)
X-Git-Tag: v1.0.1~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4199facacd002fdaa2aa9c00d3bc81f9b8569862;p=thirdparty%2FPython%2Fcpython.git

Added getmappingsize().  (Needed by previous checkin of posixmodule.c)
---

diff --git a/Include/mappingobject.h b/Include/mappingobject.h
index f6d36e0d1bd0..7d006dd568a4 100644
--- a/Include/mappingobject.h
+++ b/Include/mappingobject.h
@@ -44,6 +44,7 @@ extern int mappinggetnext
 extern object *getmappingkeys PROTO((object *mp));
 extern object *getmappingvalues PROTO((object *mp));
 extern object *getmappingitems PROTO((object *mp));
+extern int getmappingsize PROTO((object *mp));
 
 #ifdef __cplusplus
 }
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 2a51d51dae26..b89b7b2786a0 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -566,6 +566,17 @@ mapping_items(mp, args)
 	return v;
 }
 
+int
+getmappingsize(mp)
+	object *mp;
+{
+	if (mp == NULL || !is_mappingobject(mp)) {
+		err_badcall();
+		return NULL;
+	}
+	return ((mappingobject *)mp)->ma_used;
+}
+
 object *
 getmappingkeys(mp)
 	object *mp;
diff --git a/Objects/mappingobject.c b/Objects/mappingobject.c
index 2a51d51dae26..b89b7b2786a0 100644
--- a/Objects/mappingobject.c
+++ b/Objects/mappingobject.c
@@ -566,6 +566,17 @@ mapping_items(mp, args)
 	return v;
 }
 
+int
+getmappingsize(mp)
+	object *mp;
+{
+	if (mp == NULL || !is_mappingobject(mp)) {
+		err_badcall();
+		return NULL;
+	}
+	return ((mappingobject *)mp)->ma_used;
+}
+
 object *
 getmappingkeys(mp)
 	object *mp;