chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: provide a custom debug function
[elogind.git]
/
extras
/
volume_id
/
libvolume_id
/
util.c
diff --git
a/extras/volume_id/libvolume_id/util.c
b/extras/volume_id/libvolume_id/util.c
index 361d7058d021e4c25978eff3850c9bdd983e0901..cf5392cf9aba7fe1512b9f0b6b3fa0f15bbd4466 100644
(file)
--- a/
extras/volume_id/libvolume_id/util.c
+++ b/
extras/volume_id/libvolume_id/util.c
@@
-25,8
+25,7
@@
#include <fcntl.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/stat.h>
-#include "volume_id.h"
-#include "logging.h"
+#include "libvolume_id.h"
#include "util.h"
void volume_id_set_unicode16(char *str, size_t len, const uint8_t *buf, enum endian endianess, size_t count)
#include "util.h"
void volume_id_set_unicode16(char *str, size_t len, const uint8_t *buf, enum endian endianess, size_t count)
@@
-68,8
+67,6
@@
static char *usage_to_string(enum volume_id_usage usage_id)
switch (usage_id) {
case VOLUME_ID_FILESYSTEM:
return "filesystem";
switch (usage_id) {
case VOLUME_ID_FILESYSTEM:
return "filesystem";
- case VOLUME_ID_PARTITIONTABLE:
- return "partitiontable";
case VOLUME_ID_OTHER:
return "other";
case VOLUME_ID_RAID:
case VOLUME_ID_OTHER:
return "other";
case VOLUME_ID_RAID:
@@
-86,12
+83,6
@@
static char *usage_to_string(enum volume_id_usage usage_id)
return NULL;
}
return NULL;
}
-void volume_id_set_usage_part(struct volume_id_partition *part, enum volume_id_usage usage_id)
-{
- part->usage_id = usage_id;
- part->usage = usage_to_string(usage_id);
-}
-
void volume_id_set_usage(struct volume_id *id, enum volume_id_usage usage_id)
{
id->usage_id = usage_id;
void volume_id_set_usage(struct volume_id *id, enum volume_id_usage usage_id)
{
id->usage_id = usage_id;