[Midnightbsd-cvs] src [10845] trunk/lib/libgeom/libgeom.h: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jun 12 20:42:15 EDT 2018
Revision: 10845
http://svnweb.midnightbsd.org/src/?rev=10845
Author: laffer1
Date: 2018-06-12 20:42:15 -0400 (Tue, 12 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/lib/libgeom/Makefile
trunk/lib/libgeom/geom_ctl.c
trunk/lib/libgeom/geom_getxml.c
trunk/lib/libgeom/geom_stats.c
trunk/lib/libgeom/geom_util.c
trunk/lib/libgeom/geom_xml2tree.c
trunk/lib/libgeom/libgeom.3
trunk/lib/libgeom/libgeom.h
Property Changed:
----------------
trunk/lib/libgeom/libgeom.3
Modified: trunk/lib/libgeom/Makefile
===================================================================
--- trunk/lib/libgeom/Makefile 2018-06-13 00:40:55 UTC (rev 10844)
+++ trunk/lib/libgeom/Makefile 2018-06-13 00:42:15 UTC (rev 10845)
@@ -1,5 +1,5 @@
# $MidnightBSD$
-# $FreeBSD: src/lib/libgeom/Makefile,v 1.12 2009/05/19 12:10:48 trasz Exp $
+# $FreeBSD: stable/10/lib/libgeom/Makefile 192376 2009-05-19 12:10:48Z trasz $
LIB= geom
SHLIBDIR?= /lib
Modified: trunk/lib/libgeom/geom_ctl.c
===================================================================
--- trunk/lib/libgeom/geom_ctl.c 2018-06-13 00:40:55 UTC (rev 10844)
+++ trunk/lib/libgeom/geom_ctl.c 2018-06-13 00:42:15 UTC (rev 10845)
@@ -27,26 +27,25 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libgeom/geom_ctl.c,v 1.7 2010/10/21 10:38:14 pjd Exp $
+ * $FreeBSD: stable/10/lib/libgeom/geom_ctl.c 319018 2017-05-28 00:25:44Z ngie $
*/
-#include <stdio.h>
+#include <sys/types.h>
+#include <sys/queue.h>
#include <fcntl.h>
#include <errno.h>
+#include <paths.h>
+#include <stdarg.h>
#include <stdint.h>
-#include <sys/types.h>
-#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <paths.h>
-#include <sys/queue.h>
-
#define GCTL_TABLE 1
#include <libgeom.h>
-/*
+/*
* Global pointer to a string that is used to avoid an errorneous free in
* gctl_free.
*/
@@ -173,7 +172,7 @@
ap->len = len;
else if (len < 0) {
ap->flag |= GCTL_PARAM_ASCII;
- ap->len = strlen(value) + 1;
+ ap->len = strlen(value) + 1;
}
}
Modified: trunk/lib/libgeom/geom_getxml.c
===================================================================
--- trunk/lib/libgeom/geom_getxml.c 2018-06-13 00:40:55 UTC (rev 10844)
+++ trunk/lib/libgeom/geom_getxml.c 2018-06-13 00:42:15 UTC (rev 10845)
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libgeom/geom_getxml.c,v 1.4 2009/12/31 01:37:26 ed Exp $
+ * $FreeBSD: stable/10/lib/libgeom/geom_getxml.c 201320 2009-12-31 01:37:26Z ed $
*/
#include <sys/types.h>
Modified: trunk/lib/libgeom/geom_stats.c
===================================================================
--- trunk/lib/libgeom/geom_stats.c 2018-06-13 00:40:55 UTC (rev 10844)
+++ trunk/lib/libgeom/geom_stats.c 2018-06-13 00:42:15 UTC (rev 10845)
@@ -27,26 +27,24 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libgeom/geom_stats.c,v 1.3 2003/03/18 09:53:46 phk Exp $
+ * $FreeBSD: stable/10/lib/libgeom/geom_stats.c 319303 2017-05-31 08:40:46Z ngie $
*/
-#include <paths.h>
+#include <sys/types.h>
+#include <sys/devicestat.h>
+#include <sys/mman.h>
+#include <sys/time.h>
#include <errno.h>
#include <fcntl.h>
+#include <paths.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <libgeom.h>
-#include <sys/mman.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/devicestat.h>
-
-
/************************************************************/
-static uint npages, pagesize, spp;
-static int statsfd = -1;
+static uint npages, spp;
+static int pagesize, statsfd = -1;
static u_char *statp;
void
@@ -68,8 +66,8 @@
if (statsfd == -1)
return;
for (;;) {
- p = mmap(statp, (npages + 1) * pagesize,
- PROT_READ, 0, statsfd, 0);
+ p = mmap(statp, (npages + 1) * pagesize,
+ PROT_READ, MAP_SHARED, statsfd, 0);
if (p == MAP_FAILED)
break;
else
@@ -91,7 +89,7 @@
return (errno);
pagesize = getpagesize();
spp = pagesize / sizeof(struct devstat);
- p = mmap(NULL, pagesize, PROT_READ, 0, statsfd, 0);
+ p = mmap(NULL, pagesize, PROT_READ, MAP_SHARED, statsfd, 0);
if (p == MAP_FAILED) {
error = errno;
close(statsfd);
Modified: trunk/lib/libgeom/geom_util.c
===================================================================
--- trunk/lib/libgeom/geom_util.c 2018-06-13 00:40:55 UTC (rev 10844)
+++ trunk/lib/libgeom/geom_util.c 2018-06-13 00:42:15 UTC (rev 10845)
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.4 2010/01/17 06:20:30 delphij Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libgeom/geom_util.c 202454 2010-01-17 06:20:30Z delphij $");
#include <sys/param.h>
#include <sys/disk.h>
Modified: trunk/lib/libgeom/geom_xml2tree.c
===================================================================
--- trunk/lib/libgeom/geom_xml2tree.c 2018-06-13 00:40:55 UTC (rev 10844)
+++ trunk/lib/libgeom/geom_xml2tree.c 2018-06-13 00:42:15 UTC (rev 10845)
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libgeom/geom_xml2tree.c,v 1.9 2010/10/05 15:27:44 emaste Exp $
+ * $FreeBSD: stable/10/lib/libgeom/geom_xml2tree.c 287792 2015-09-14 18:05:27Z delphij $
*/
#include <stdio.h>
@@ -187,6 +187,7 @@
EndElement(void *userData, const char *name)
{
struct mystate *mt;
+ struct gconf *c;
struct gconfig *gc;
char *p;
@@ -257,10 +258,18 @@
if (!strcmp(name, "config")) {
mt->config = NULL;
+ free(p);
return;
}
- if (mt->config != NULL) {
+ if (mt->config != NULL || (!strcmp(name, "wither") &&
+ (mt->provider != NULL || mt->geom != NULL))) {
+ if (mt->config != NULL)
+ c = mt->config;
+ else if (mt->provider != NULL)
+ c = &mt->provider->lg_config;
+ else
+ c = &mt->geom->lg_config;
gc = calloc(1, sizeof *gc);
if (gc == NULL) {
mt->error = errno;
@@ -267,6 +276,7 @@
XML_StopParser(mt->parser, 0);
warn("Cannot allocate memory during processing of '%s' "
"element", name);
+ free(p);
return;
}
gc->lg_name = strdup(name);
@@ -275,15 +285,19 @@
XML_StopParser(mt->parser, 0);
warn("Cannot allocate memory during processing of '%s' "
"element", name);
+ free(gc);
+ free(p);
return;
}
gc->lg_val = p;
- LIST_INSERT_HEAD(mt->config, gc, lg_config);
+ LIST_INSERT_HEAD(c, gc, lg_config);
return;
}
if (p != NULL) {
+#if DEBUG_LIBGEOM > 0
printf("Unexpected XML: name=%s data=\"%s\"\n", name, p);
+#endif
free(p);
}
Modified: trunk/lib/libgeom/libgeom.3
===================================================================
--- trunk/lib/libgeom/libgeom.3 2018-06-13 00:40:55 UTC (rev 10844)
+++ trunk/lib/libgeom/libgeom.3 2018-06-13 00:42:15 UTC (rev 10845)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2003 Poul-Henning Kamp
.\" Copyright (c) 2007 Pawel Jakub Dawidek <pjd at FreeBSD.org>
.\" All rights reserved.
@@ -26,10 +27,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.15 2010/12/04 08:44:56 jh Exp $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/lib/libgeom/libgeom.3 319003 2017-05-27 22:57:07Z ngie $
.\"
-.Dd December 4, 2010
+.Dd April 22, 2017
.Dt LIBGEOM 3
.Os
.Sh NAME
@@ -64,6 +64,10 @@
.Sh LIBRARY
.Lb libgeom
.Sh SYNOPSIS
+.Bd -literal
+/* stdio.h is only required for `gctl_dump` */
+.Ed
+.In stdio.h
.In libgeom.h
.Ss "Statistics Functions"
.Ft void
@@ -325,8 +329,8 @@
.Fn g_device_path
function returns the full path to a provider given a partial or full path to the
device node.
-If the device can not be found or is not a valid geom provider, NULL is
-returned.
+.Dv NULL
+is returned if the device cannot be found or is not a valid geom provider.
.Pp
The
.Fn g_get_ident
@@ -345,20 +349,19 @@
.Pp
The
.Fn g_open_by_ident
-function opens provider using its ident, unlike
+function opens provider using its identification, unlike
.Fn g_open
-which uses provider's name.
-If the
+which uses the provider's name.
+The function will store the provider's name in the
.Fa name
-argument is not
-.Dv NULL ,
-the function will store provider's name there.
+parameter if it is not
+.Dv NULL .
.Pp
The
.Fn g_providername
function returns the provider name of an open file descriptor.
-If the file descriptor does not point to a valid geom provider, NULL is
-returned.
+.Dv NULL
+is returned the file descriptor does not point to a valid geom provider.
.Pp
All functions except
.Fn g_providername
Property changes on: trunk/lib/libgeom/libgeom.3
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libgeom/libgeom.h
===================================================================
--- trunk/lib/libgeom/libgeom.h 2018-06-13 00:40:55 UTC (rev 10844)
+++ trunk/lib/libgeom/libgeom.h 2018-06-13 00:42:15 UTC (rev 10845)
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.14 2010/01/17 06:20:30 delphij Exp $
+ * $FreeBSD: stable/10/lib/libgeom/libgeom.h 253469 2013-07-19 06:42:15Z scottl $
*/
#ifndef _LIBGEOM_H_
#define _LIBGEOM_H_
@@ -41,6 +41,10 @@
__BEGIN_DECLS
+#ifndef DEBUG_LIBGEOM
+#define DEBUG_LIBGEOM 0
+#endif
+
void geom_stats_close(void);
void geom_stats_resync(void);
int geom_stats_open(void);
More information about the Midnightbsd-cvs
mailing list