X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=3ec4c6e1442947422eff75e5a3ed3f6d24dc7224;hb=f453199292b45007e5078f568f3bce2e8c8b4067;hp=aeea28d3529e6b4ef766de64e4688adc10ca7e46;hpb=98062438c25226e2e4a28ab629de5dfa27a79913;p=collectd.git

diff --git a/src/common.c b/src/common.c
index aeea28d3..3ec4c6e1 100644
--- a/src/common.c
+++ b/src/common.c
@@ -347,28 +347,69 @@ int escape_slashes (char *buf, int buf_len)
 	return (0);
 } /* int escape_slashes */
 
-int timeval_sub_timespec (struct timeval *tv0, struct timeval *tv1, struct timespec *ret)
+void replace_special (char *buffer, size_t buffer_size)
 {
-	if ((tv0 == NULL) || (tv1 == NULL) || (ret == NULL))
-		return (-2);
+	size_t i;
 
-	if ((tv0->tv_sec < tv1->tv_sec)
-			|| ((tv0->tv_sec == tv1->tv_sec) && (tv0->tv_usec < tv1->tv_usec)))
-		return (-1);
+	for (i = 0; i < buffer_size; i++)
+	{
+		if (buffer[i] == 0)
+			return;
+		if ((!isalnum ((int) buffer[i])) && (buffer[i] != '-'))
+			buffer[i] = '_';
+	}
+} /* void replace_special */
+
+int timeval_cmp (struct timeval tv0, struct timeval tv1, struct timeval *delta)
+{
+	struct timeval *larger;
+	struct timeval *smaller;
 
-	ret->tv_sec  = tv0->tv_sec - tv1->tv_sec;
-	ret->tv_nsec = 1000 * ((long) (tv0->tv_usec - tv1->tv_usec));
+	int status;
+
+	NORMALIZE_TIMEVAL (tv0);
+	NORMALIZE_TIMEVAL (tv1);
+
+	if ((tv0.tv_sec == tv1.tv_sec) && (tv0.tv_usec == tv1.tv_usec))
+	{
+		if (delta != NULL) {
+			delta->tv_sec  = 0;
+			delta->tv_usec = 0;
+		}
+		return (0);
+	}
 
-	if (ret->tv_nsec < 0)
+	if ((tv0.tv_sec < tv1.tv_sec)
+			|| ((tv0.tv_sec == tv1.tv_sec) && (tv0.tv_usec < tv1.tv_usec)))
 	{
-		assert (ret->tv_sec > 0);
+		larger  = &tv1;
+		smaller = &tv0;
+		status  = -1;
+	}
+	else
+	{
+		larger  = &tv0;
+		smaller = &tv1;
+		status  = 1;
+	}
+
+	if (delta != NULL) {
+		delta->tv_sec = larger->tv_sec - smaller->tv_sec;
 
-		ret->tv_nsec += 1000000000;
-		ret->tv_sec  -= 1;
+		if (smaller->tv_usec <= larger->tv_usec)
+			delta->tv_usec = larger->tv_usec - smaller->tv_usec;
+		else
+		{
+			--delta->tv_sec;
+			delta->tv_usec = 1000000 + larger->tv_usec - smaller->tv_usec;
+		}
 	}
 
-	return (0);
-}
+	assert ((delta == NULL)
+			|| ((0 <= delta->tv_usec) && (delta->tv_usec < 1000000)));
+
+	return (status);
+} /* int timeval_cmp */
 
 int check_create_dir (const char *file_orig)
 {
@@ -383,7 +424,7 @@ int check_create_dir (const char *file_orig)
 	char *saveptr;
 	int   last_is_file = 1;
 	int   path_is_absolute = 0;
-	int   len;
+	size_t len;
 	int   i;
 
 	/*