upstream/oracle/userland-gate: comparison components/visual-panels/time/src/cmd/rad/mod/time/mod

equal deleted inserted replaced

-:63d3bf696d85
+:19b502ccabc8
 #define	ZONEINFO_DIR	"/usr/share/lib/zoneinfo/" /* trailing / essential */
 /*ARGSUSED*/
 conerr_t
 interface_Time_read_time(rad_instance_t *inst, adr_attribute_t *attr,
-data_t **data, data_t **error)
+adr_data_t **data, adr_data_t **error)
 {
-	*data = data_new_time_now();
+	*data = adr_data_new_time_now();
 	return (ce_ok);
 }
 #define	NSPERUS	(NANOSEC / MICROSEC)
 /*ARGSUSED*/
 conerr_t
 interface_Time_write_time(rad_instance_t *inst, adr_attribute_t *attr,
-data_t *data, data_t **error)
+adr_data_t *data, adr_data_t **error)
 {
-	long long seconds = data_to_time_secs(data);
+	long long seconds = adr_data_to_time_secs(data);
-	int nanos = data_to_time_nsecs(data);
+	int nanos = adr_data_to_time_nsecs(data);
 	int micros = nanos / NSPERUS;
 	time_t newtime;
 	struct timeval adj;
 	if (nanos - (micros * NSPERUS) >= NSPERUS / 2) {
 }
 /*ARGSUSED*/
 conerr_t
 interface_Time_read_defaultTimeZone(rad_instance_t *inst, adr_attribute_t *attr,
-data_t **data, data_t **error)
+adr_data_t **data, adr_data_t **error)
 {
 	char zonefile[PATH_MAX];
 	int n = snprintf(zonefile, PATH_MAX, "%s", ZONEINFO_DIR);
 	char *tz = zonefile + n;
 	conerr_t err = smfu_get_property((char *)SCF_INSTANCE_ENV,
 		char resolved[PATH_MAX];
 		if (realpath(zonefile, resolved) != NULL &&
 		    strncmp(resolved, ZONEINFO_DIR, n) == 0) {
 			tz = resolved + n;
 		}
-		*data = data_new_string(tz, lt_copy);
+		*data = adr_data_new_string(tz, LT_COPY);
 	}
 	return (err);
 }
 /*ARGSUSED*/
 conerr_t
 interface_Time_write_defaultTimeZone(rad_instance_t *inst,
-adr_attribute_t *attr, data_t *data, data_t **error)
+adr_attribute_t *attr, adr_data_t *data, adr_data_t **error)
 {
 	conerr_t err = smfu_set_property((char *)SCF_INSTANCE_ENV,
-	    SMF_TZ_PGNAME, SMF_TZ_PROPNAME, (char *)data_to_string(data));
+	    SMF_TZ_PGNAME, SMF_TZ_PROPNAME, (char *)adr_data_to_string(data));
 	return (err);
 }
 static void
 removenl(char *str)
 };
 static const char * const si_server_path[] = { "server", NULL };
 static void
-disable(data_t *array, const char *srv, int len)
+disable(adr_data_t *array, const char *srv, int len)
 {
-	if (array_nsearch(array, srv, len, si_server_path) >= 0)
+	if (adr_array_nsearch(array, srv, len, si_server_path) >= 0)
 		return;
-	data_t *entry = data_new_struct(&t__ServerInfo);
+	adr_data_t *entry = adr_data_new_struct(&t__ServerInfo);
-	struct_set(entry, "server", data_new_nstring(srv, len));
+	adr_struct_set(entry, "server", adr_data_new_nstring(srv, len));
-	struct_set(entry, "enabled", data_new_boolean(B_FALSE));
+	adr_struct_set(entry, "enabled", adr_data_new_boolean(B_FALSE));
-	(void) array_add(array, entry);
+	(void) adr_array_add(array, entry);
 }
 static void
-enable(data_t *array, const char *srv, int len)
+enable(adr_data_t *array, const char *srv, int len)
 {
-	int index = array_nsearch(array, srv, len, si_server_path);
+	int index = adr_array_nsearch(array, srv, len, si_server_path);
 	if (index >= 0) {
-		struct_set(array_get(array, index), "enabled",
+		adr_struct_set(adr_array_get(array, index), "enabled",
-		    data_new_boolean(B_TRUE));
+		    adr_data_new_boolean(B_TRUE));
 		return;
 	}
-	data_t *entry = data_new_struct(&t__ServerInfo);
+	adr_data_t *entry = adr_data_new_struct(&t__ServerInfo);
-	struct_set(entry, "server", data_new_nstring(srv, len));
+	adr_struct_set(entry, "server", adr_data_new_nstring(srv, len));
-	struct_set(entry, "enabled", data_new_boolean(B_TRUE));
+	adr_struct_set(entry, "enabled", adr_data_new_boolean(B_TRUE));
-	(void) array_add(array, entry);
+	(void) adr_array_add(array, entry);
 }
 /*ARGSUSED*/
 conerr_t
 interface_Time_read_ntpServers(rad_instance_t *inst, adr_attribute_t *attr,
-data_t **data, data_t **error)
+adr_data_t **data, adr_data_t **error)
 {
-	data_t *result = data_new_array(&t_array__ServerInfo, 4);
+	adr_data_t *result = adr_data_new_array(&t_array__ServerInfo, 4);
 	for (int i = 0; i < RAD_COUNT(ntpservers); i++) {
-		data_t *si = data_new_struct(&t__ServerInfo);
+		adr_data_t *si = adr_data_new_struct(&t__ServerInfo);
-		struct_set(si, "server",
+		adr_struct_set(si, "server",
-		    data_new_string(ntpservers[i], lt_copy));
+		    adr_data_new_string(ntpservers[i], LT_COPY));
-		struct_set(si, "enabled", data_new_boolean(B_FALSE));
+		adr_struct_set(si, "enabled", adr_data_new_boolean(B_FALSE));
-		(void) array_add(result, si);
+		(void) adr_array_add(result, si);
 	}
 	FILE *file = fopen(NTP_CONF, "r");
 	if (file != NULL) {
 		char buf[1024];
 }
 /*ARGSUSED*/
 conerr_t
 interface_Time_read_sufficientlyPrivileged(rad_instance_t *inst,
-adr_attribute_t *attr, data_t **data, data_t **error)
+adr_attribute_t *attr, adr_data_t **data, adr_data_t **error)
 {
 	/* XXX: Crude */
-	*data = data_new_boolean(getuid() == 0);
+	*data = adr_data_new_boolean(getuid() == 0);
 	return (ce_ok);
 }
 /*ARGSUSED*/
 conerr_t
 interface_Time_read_continents(rad_instance_t *inst, adr_attribute_t *attr,
-data_t **data, data_t **error)
+adr_data_t **data, adr_data_t **error)
 {
 	FILE *file = fopen("/usr/share/lib/zoneinfo/tab/continent.tab", "r");
 	char str[1024];
-	data_t *result = data_new_array(&t_array__Continent, 5);
+	adr_data_t *result = adr_data_new_array(&t_array__Continent, 5);
 	while (fgets(str, sizeof (str), file) != NULL) {
 		if (str[0] == '#')
 			continue;
 		removenl(str);
 		char *eq = strchr(str, '\t');
 		if (eq == NULL)
 			continue;
-		data_t *name = data_new_nstring(str, eq - str);
+		adr_data_t *name = adr_data_new_nstring(str, eq - str);
-		data_t *desc = data_new_string(eq + 1, lt_copy);
+		adr_data_t *desc = adr_data_new_string(eq + 1, LT_COPY);
-		data_t *cont = data_new_struct(&t__Continent);
+		adr_data_t *cont = adr_data_new_struct(&t__Continent);
-		struct_set(cont, "name", name);
+		adr_struct_set(cont, "name", name);
-		struct_set(cont, "description", desc);
+		adr_struct_set(cont, "description", desc);
-		(void) array_add(result, cont);
+		(void) adr_array_add(result, cont);
 	}
 	(void) fclose(file);
 	*data = result;
 	return (ce_ok);
 }
 /*ARGSUSED*/
 conerr_t
 interface_Time_read_countries(rad_instance_t *inst, adr_attribute_t *attr,
-data_t **data, data_t **error)
+adr_data_t **data, adr_data_t **error)
 {
 	FILE *file = fopen("/usr/share/lib/zoneinfo/tab/country.tab", "r");
 	char str[1024];
-	data_t *result = data_new_array(&t_array__Country, 5);
+	adr_data_t *result = adr_data_new_array(&t_array__Country, 5);
 	while (fgets(str, sizeof (str), file) != NULL) {
 		if (str[0] == '#')
 			continue;
 		removenl(str);
 			continue;
 		if (rad_strccmp("ee", str, eq - str) == 0 ||
 		    rad_strccmp("we", str, eq - str) == 0 ||
 		    rad_strccmp("me", str, eq - str) == 0)
 			continue;
-		data_t *code = data_new_nstring(str, eq - str);
+		adr_data_t *code = adr_data_new_nstring(str, eq - str);
-		data_t *desc = data_new_string(eq + 1, lt_copy);
+		adr_data_t *desc = adr_data_new_string(eq + 1, LT_COPY);
-		data_t *country = data_new_struct(&t__Country);
+		adr_data_t *country = adr_data_new_struct(&t__Country);
-		struct_set(country, "code", code);
+		adr_struct_set(country, "code", code);
-		struct_set(country, "description", desc);
+		adr_struct_set(country, "description", desc);
-		(void) array_add(result, country);
+		(void) adr_array_add(result, country);
 	}
 	(void) fclose(file);
 	*data = result;
 	return (ce_ok);
 		const char *fmt = (len & 1) ? "%3u%2u" : "%2u%2u";
 		return (sscanf(str, fmt, &c->deg, &c->min) == 2);
 	}
 }
-static data_t *
+static adr_data_t *
 parse_coords(const char *str, int len)
 {
 	int isnorth, iseast;
 	if (len > 0 && str[0] == '+')
 	if (!parse_coord(str, eq - str, &north) ||
 	    !parse_coord(eq + 1, len - (eq - str + 1), &east))
 		return (NULL);
-	data_t *result = data_new_struct(&t__Coordinates);
+	adr_data_t *result = adr_data_new_struct(&t__Coordinates);
-	struct_set(result, "degreesE", data_new_integer(east.deg * iseast));
+	adr_struct_set(result, "degreesE",
-	struct_set(result, "minutesE", data_new_integer(east.min));
+	    adr_data_new_integer(east.deg * iseast));
-	struct_set(result, "secondsE", data_new_integer(east.sec));
+	adr_struct_set(result, "minutesE", adr_data_new_integer(east.min));
-	struct_set(result, "degreesN", data_new_integer(north.deg * isnorth));
+	adr_struct_set(result, "secondsE", adr_data_new_integer(east.sec));
-	struct_set(result, "minutesN", data_new_integer(north.min));
+	adr_struct_set(result, "degreesN",
-	struct_set(result, "secondsN", data_new_integer(north.sec));
+	    adr_data_new_integer(north.deg * isnorth));
+	adr_struct_set(result, "minutesN", adr_data_new_integer(north.min));
+	adr_struct_set(result, "secondsN", adr_data_new_integer(north.sec));
 	return (result);
 }
 /*ARGSUSED*/
 conerr_t
 interface_Time_read_timeZones(rad_instance_t *inst, adr_attribute_t *attr,
-data_t **data, data_t **error)
+adr_data_t **data, adr_data_t **error)
 {
 	FILE *file = fopen("/usr/share/lib/zoneinfo/tab/zone_sun.tab", "r");
 	char buf[1024];
-	data_t *result = data_new_array(&t_array__TimeZoneInfo, 5);
+	adr_data_t *result = adr_data_new_array(&t_array__TimeZoneInfo, 5);
 	while (fgets(buf, sizeof (buf), file) != NULL) {
 		char *str = buf;
 		if (str[0] == '#')
 			continue;
 		removenl(str);
 			continue;
 		if (rad_strccmp("ee", str, eq - str) == 0 ||
 		    rad_strccmp("we", str, eq - str) == 0 ||
 		    rad_strccmp("me", str, eq - str) == 0)
 			continue;
-		data_t *timezone = data_new_struct(&t__TimeZoneInfo);
+		adr_data_t *timezone = adr_data_new_struct(&t__TimeZoneInfo);
-		struct_set(timezone, "countryCode",
+		adr_struct_set(timezone, "countryCode",
-		    data_new_nstring(str, eq - str));
+		    adr_data_new_nstring(str, eq - str));
 		str = eq + 1;
 		eq = strchr(str, '\t');
-		data_t *coords;
+		adr_data_t *coords;
 		if (eq == NULL ||
 		    (coords = parse_coords(str, eq - str)) == NULL) {
-			data_free(timezone);
+			adr_data_free(timezone);
 			continue;
 		}
-		struct_set(timezone, "coordinates", coords);
+		adr_struct_set(timezone, "coordinates", coords);
 		str = eq + 1;
 		eq = strchr(str, '\t');
-		data_t *tz = eq != NULL ? data_new_nstring(str, eq - str) :
+		adr_data_t *tz = eq != NULL ?
-		    data_new_string(str, lt_copy);
+		    adr_data_new_nstring(str, eq - str) :
-		struct_set(timezone, "name", tz);
+		    adr_data_new_string(str, LT_COPY);
+		adr_struct_set(timezone, "name", tz);
 		if (eq == NULL)
 			goto done;
 		str = eq + 1;
 		eq = strchr(str, '\t');
 		if (eq != NULL) {
 			if (rad_strccmp("-", str, eq - str) != 0)
-				struct_set(timezone, "altName",
+				adr_struct_set(timezone, "altName",
-				    data_new_nstring(str, eq - str));
+				    adr_data_new_nstring(str, eq - str));
 		} else {
 			if (strcmp("-", str) != 0)
-				struct_set(timezone, "altName",
+				adr_struct_set(timezone, "altName",
-				    data_new_string(str, lt_copy));
+				    adr_data_new_string(str, LT_COPY));
 			goto done;
 		}
 		str = eq + 1;
 		if (*str != '\0' && strcmp(str, "-") != 0)
-			struct_set(timezone, "comments",
+			adr_struct_set(timezone, "comments",
-			    data_new_string(str, lt_copy));
+			    adr_data_new_string(str, LT_COPY));
 done:
-		(void) array_add(result, timezone);
+		(void) adr_array_add(result, timezone);
 	}
 	(void) fclose(file);
 	*data = result;
 	return (ce_ok);
 }
 /*ARGSUSED*/
 conerr_t
 interface_Time_write_ntpServers(rad_instance_t *inst, adr_attribute_t *attr,
-data_t *data, data_t **error)
+adr_data_t *data, adr_data_t **error)
 {
 	FILE *from, *to, *tmp; /* Read, write, & temp files */
 	int err = 0; /* Indicates an error */
 	int size = 256; /* Buffer size */
 	char buffer[size]; /* Read buffer */
 		err = errno;
 		(void) fclose(tmp);
 		goto errorout;
 	}
-	for (int i = 0; i < array_size(data); i++) {
+	for (int i = 0; i < adr_array_size(data); i++) {
-		data_t *entry = array_get(data, i);
+		adr_data_t *entry = adr_array_get(data, i);
-		data_t *enabled = struct_get(entry, "enabled");
+		adr_data_t *enabled = adr_struct_get(entry, "enabled");
-		data_t *server = struct_get(entry, "server");
+		adr_data_t *server = adr_struct_get(entry, "server");
 		if (fprintf(tmp,
-		    data_to_boolean(enabled) ? "server %s\n" : "# server %s\n",
+		    adr_data_to_boolean(enabled) ? "server %s\n" :
-		    data_to_string(server)) < 0)
+		    "# server %s\n", adr_data_to_string(server)) < 0)
 			goto writefailed;
 	}
 	if (fclose(tmp) == EOF)
 		goto writefailed;

changeset 901	19b502ccabc8
parent 827	0944d8c0158b
child 1410	ca9946e5736c