Commit2b69afb

committed

add new list type simple_oid_string_list to fe-utils/simple_list

This type contains both an oid and a string.This will be used in forthcoming changes to pg_restore.Author: Andrew Dunstan <andrew@dunslane.net>

1 parentc1da728 commit2b69afbCopy full SHA for 2b69afb

File tree

+59

-0

lines changed

+59

-0

lines changed

Lines changed: 41 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,3 +192,44 @@ simple_ptr_list_destroy(SimplePtrList *list)`
`192`	`192`	`cell=next;`
`193`	`193`	`}`
`194`	`194`	`}`
	`195`	`+`
	`196`	`+/*`
	`197`	`+ * Add to an oid_string list`
	`198`	`+ */`
	`199`	`+void`
	`200`	`+simple_oid_string_list_append(SimpleOidStringListlist,Oidoid,constcharstr)`
	`201`	`+{`
	`202`	`+SimpleOidStringListCell*cell;`
	`203`	`+`
	`204`	`+cell= (SimpleOidStringListCell*)`
	`205`	`+pg_malloc(offsetof(SimpleOidStringListCell,str)+strlen(str)+1);`
	`206`	`+`
	`207`	`+cell->next=NULL;`
	`208`	`+cell->oid=oid;`
	`209`	`+strcpy(cell->str,str);`
	`210`	`+`
	`211`	`+if (list->tail)`
	`212`	`+list->tail->next=cell;`
	`213`	`+else`
	`214`	`+list->head=cell;`
	`215`	`+list->tail=cell;`
	`216`	`+}`
	`217`	`+`
	`218`	`+/*`
	`219`	`+ * Destroy an oid_string list`
	`220`	`+ */`
	`221`	`+void`
	`222`	`+simple_oid_string_list_destroy(SimpleOidStringList*list)`
	`223`	`+{`
	`224`	`+SimpleOidStringListCell*cell;`
	`225`	`+`
	`226`	`+cell=list->head;`
	`227`	`+while (cell!=NULL)`
	`228`	`+{`
	`229`	`+SimpleOidStringListCell*next;`
	`230`	`+`
	`231`	`+next=cell->next;`
	`232`	`+pg_free(cell);`
	`233`	`+cell=next;`
	`234`	`+}`
	`235`	`+}`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,19 @@ typedef struct SimplePtrList`
`55`	`55`	`SimplePtrListCell*tail;`
`56`	`56`	`}SimplePtrList;`
`57`	`57`
	`58`	`+typedefstructSimpleOidStringListCell`
	`59`	`+{`
	`60`	`+structSimpleOidStringListCell*next;`
	`61`	`+Oidoid;`
	`62`	`+charstr[FLEXIBLE_ARRAY_MEMBER];/* null-terminated string here */`
	`63`	`+}SimpleOidStringListCell;`
	`64`	`+`
	`65`	`+typedefstructSimpleOidStringList`
	`66`	`+{`
	`67`	`+SimpleOidStringListCell*head;`
	`68`	`+SimpleOidStringListCell*tail;`
	`69`	`+}SimpleOidStringList;`
	`70`	`+`
`58`	`71`	`externvoidsimple_oid_list_append(SimpleOidList*list,Oidval);`
`59`	`72`	`externboolsimple_oid_list_member(SimpleOidList*list,Oidval);`
`60`	`73`	`externvoidsimple_oid_list_destroy(SimpleOidList*list);`
`@@ -68,4 +81,7 @@ extern const char simple_string_list_not_touched(SimpleStringList list);`
`68`	`81`	`externvoidsimple_ptr_list_append(SimplePtrListlist,voidptr);`
`69`	`82`	`externvoidsimple_ptr_list_destroy(SimplePtrList*list);`
`70`	`83`
	`84`	`+externvoidsimple_oid_string_list_append(SimpleOidStringListlist,Oidoid,constcharstr);`
	`85`	`+externvoidsimple_oid_string_list_destroy(SimpleOidStringList*list);`
	`86`	`+`
`71`	`87`	`#endif/* SIMPLE_LIST_H */`

Lines changed: 2 additions & 0 deletions

Comments

(0)