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

gvanrossum · gvanrossum · commit 4199facacd00 · 1993-11-05T10:18:44.000Z
diff --git 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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ extern int mappinggetnext`
`44`	`44`	`extern object getmappingkeys PROTO((object mp));`
`45`	`45`	`extern object getmappingvalues PROTO((object mp));`
`46`	`46`	`extern object getmappingitems PROTO((object mp));`
	`47`	`+extern int getmappingsize PROTO((object *mp));`
`47`	`48`
`48`	`49`	`#ifdef __cplusplus`
`49`	`50`	`}`