varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-12 16:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-analyze: rename :id to :fs-spec to match fstab

Browse Source 
This is the description of the field in fstab(5) so we want to match that
so it's a bit more clear what we're keying off of when translating to a
mount device we can access on the host.
This commit is contained in:
Christian Hergert
2023-05-19 10:17:03 -07:00
parent 9e2ddae05c
commit 90519fe830
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsysprof-analyze/sysprof-mount-device-private.h
View File

@ -28,10 +28,10 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (SysprofMountDevice, sysprof_mount_device, SYSPROF, MOUNT_DEVICE, GObject) G_DECLARE_FINAL_TYPE (SysprofMountDevice, sysprof_mount_device, SYSPROF, MOUNT_DEVICE, GObject)
SysprofMountDevice *sysprof_mount_device_new (GRefString *id, SysprofMountDevice *sysprof_mount_device_new (GRefString *fs_spec,
GRefString *mount_point, GRefString *mount_point,
GRefString *subvolume); GRefString *subvolume);
const char *sysprof_mount_device_get_id (SysprofMountDevice *self); const char *sysprof_mount_device_get_fs_spec (SysprofMountDevice *self);
const char *sysprof_mount_device_get_mount_point (SysprofMountDevice *self); const char *sysprof_mount_device_get_mount_point (SysprofMountDevice *self);
const char *sysprof_mount_device_get_subvolume (SysprofMountDevice *self); const char *sysprof_mount_device_get_subvolume (SysprofMountDevice *self);

22
src/libsysprof-analyze/sysprof-mount-device.c
View File

@ -25,14 +25,14 @@
struct _SysprofMountDevice struct _SysprofMountDevice
{ {
GObject parent_instance; GObject parent_instance;
GRefString *id; GRefString *fs_spec;
GRefString *mount_point; GRefString *mount_point;
GRefString *subvolume; GRefString *subvolume;
}; };
enum { enum {
PROP_0, PROP_0,
PROP_ID, PROP_FS_SPEC,
PROP_MOUNT_POINT, PROP_MOUNT_POINT,
PROP_SUBVOLUME, PROP_SUBVOLUME,
N_PROPS N_PROPS
@ -47,7 +47,7 @@ sysprof_mount_device_finalize (GObject *object)
{ {
SysprofMountDevice *self = (SysprofMountDevice *)object; SysprofMountDevice *self = (SysprofMountDevice *)object;
g_clear_pointer (&self->id, g_ref_string_release); g_clear_pointer (&self->fs_spec, g_ref_string_release);
g_clear_pointer (&self->mount_point, g_ref_string_release); g_clear_pointer (&self->mount_point, g_ref_string_release);
g_clear_pointer (&self->subvolume, g_ref_string_release); g_clear_pointer (&self->subvolume, g_ref_string_release);
@ -64,8 +64,8 @@ sysprof_mount_device_get_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_ID: case PROP_FS_SPEC:
g_value_set_string (value, sysprof_mount_device_get_id (self)); g_value_set_string (value, sysprof_mount_device_get_fs_spec (self));
break; break;
case PROP_MOUNT_POINT: case PROP_MOUNT_POINT:
@ -89,8 +89,8 @@ sysprof_mount_device_class_init (SysprofMountDeviceClass *klass)
object_class->finalize = sysprof_mount_device_finalize; object_class->finalize = sysprof_mount_device_finalize;
object_class->get_property = sysprof_mount_device_get_property; object_class->get_property = sysprof_mount_device_get_property;
properties [PROP_ID] = properties [PROP_FS_SPEC] =
g_param_spec_string ("id", NULL, NULL, g_param_spec_string ("fs-spec", NULL, NULL,
NULL, NULL,
(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
@ -113,14 +113,14 @@ sysprof_mount_device_init (SysprofMountDevice *self)
} }
SysprofMountDevice * SysprofMountDevice *
sysprof_mount_device_new (GRefString *id, sysprof_mount_device_new (GRefString *fs_spec,
GRefString *mount_point, GRefString *mount_point,
GRefString *subvolume) GRefString *subvolume)
{ {
SysprofMountDevice *self; SysprofMountDevice *self;
self = g_object_new (SYSPROF_TYPE_MOUNT_DEVICE, NULL); self = g_object_new (SYSPROF_TYPE_MOUNT_DEVICE, NULL);
self->id = id; self->fs_spec = fs_spec;
self->mount_point = mount_point; self->mount_point = mount_point;
self->subvolume = subvolume; self->subvolume = subvolume;
@ -128,11 +128,11 @@ sysprof_mount_device_new (GRefString *id,
} }
const char * const char *
sysprof_mount_device_get_id (SysprofMountDevice *self) sysprof_mount_device_get_fs_spec (SysprofMountDevice *self)
{ {
g_return_val_if_fail (SYSPROF_IS_MOUNT_DEVICE (self), NULL); g_return_val_if_fail (SYSPROF_IS_MOUNT_DEVICE (self), NULL);
return self->id; return self->fs_spec;
} }
const char * const char *