Merge pull request #6 from MatthiasPetermann/bugfix/integer-overflow

Bugfix/integer overflow
This commit is contained in:
Matthias Petermann 2024-05-23 05:14:21 +02:00 committed by GitHub
commit f2a7699339
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 7 deletions

View file

@ -1,6 +1,7 @@
CC=cc CC=cc
CFLAGS=-Wall -Wextra CFLAGS=-Wall -Wextra
TARGET=netbsd_exporter TARGET=netbsd_exporter
VERSION=0.9.4
PACKAGE=$(TARGET)-$(VERSION).tar.gz PACKAGE=$(TARGET)-$(VERSION).tar.gz

View file

@ -53,11 +53,11 @@
#include "netbsd_exporter.h" #include "netbsd_exporter.h"
#include "version.h" #include "version.h"
void print_filesystem_metric(const char* metric, const char* device, const char* mountpoint, long value) { void print_filesystem_metric(const char* metric, const char* device, const char* mountpoint, unsigned long long value) {
printf("netbsd_fs_%s_bytes{device=\"%s\",mountpoint=\"%s\"} %ld\n", metric, device, mountpoint, value); printf("netbsd_fs_%s_bytes{device=\"%s\",mountpoint=\"%s\"} %llu\n", metric, device, mountpoint, value);
} }
void print_disk_io_metric(const char* device, long long unsigned int rbytes, long long unsigned int wbytes) { void print_disk_io_metric(const char* device, unsigned long long rbytes, unsigned long long wbytes) {
printf("netbsd_dk_read_bytes{device=\"%s\"} %llu\n", device, rbytes); printf("netbsd_dk_read_bytes{device=\"%s\"} %llu\n", device, rbytes);
printf("netbsd_dk_write_bytes{device=\"%s\"} %llu\n", device, wbytes); printf("netbsd_dk_write_bytes{device=\"%s\"} %llu\n", device, wbytes);
} }

View file

@ -31,13 +31,13 @@ const char *program_name = "netbsd_exporter";
int option_http_header = 1; int option_http_header = 1;
int option_syslog = 1; int option_syslog = 1;
void print_filesystem_metric(const char*, const char*, const char*, long ); void print_filesystem_metric(const char*, const char*, const char*, unsigned long long);
void print_disk_io_metric(const char*, long long unsigned int, long long unsigned int ); void print_disk_io_metric(const char*, unsigned long long, unsigned long long);
void print_load_metric(const char*, double ); void print_load_metric(const char*, double );
void print_network_metric(const char*, unsigned long long, unsigned long long, unsigned long long ); void print_network_metric(const char*, unsigned long long, unsigned long long, unsigned long long);
void print_memory_metric(const char*, long ); void print_memory_metric(const char*, long );

View file

@ -28,6 +28,6 @@
#define MAJOR_VERSION 0 #define MAJOR_VERSION 0
#define MINOR_VERSION 9 #define MINOR_VERSION 9
#define PATCH_VERSION 3 #define PATCH_VERSION 4
#endif #endif