diff options
author | Jan Synacek <jsynacek@redhat.com> | 2014-05-05 15:28:58 +0200 |
---|---|---|
committer | Jan Synacek <jsynacek@redhat.com> | 2014-05-06 08:31:20 +0200 |
commit | 08a3b7128e27f474046afa3f78b55df221c59dd9 (patch) | |
tree | f59578a238b6086c31904bf925567f96eef0280a /src/logicalfile | |
parent | 55f63d29f5d2b4e82979d71386df58394e87ef5a (diff) | |
download | openlmi-providers-08a3b7128e27f474046afa3f78b55df221c59dd9.tar.gz openlmi-providers-08a3b7128e27f474046afa3f78b55df221c59dd9.tar.xz openlmi-providers-08a3b7128e27f474046afa3f78b55df221c59dd9.zip |
libopenlmi: minor fixes and improvements
Diffstat (limited to 'src/logicalfile')
-rw-r--r-- | src/logicalfile/LMI_DataFileProvider.c | 6 | ||||
-rw-r--r-- | src/logicalfile/LMI_DirectoryContainsFileProvider.c | 40 | ||||
-rw-r--r-- | src/logicalfile/LMI_FIFOPipeFileProvider.c | 6 | ||||
-rw-r--r-- | src/logicalfile/LMI_FileIdentityProvider.c | 44 | ||||
-rw-r--r-- | src/logicalfile/LMI_RootDirectoryProvider.c | 28 | ||||
-rw-r--r-- | src/logicalfile/LMI_SymbolicLinkProvider.c | 12 | ||||
-rw-r--r-- | src/logicalfile/LMI_UnixDeviceFileProvider.c | 6 | ||||
-rw-r--r-- | src/logicalfile/LMI_UnixDirectoryProvider.c | 12 | ||||
-rw-r--r-- | src/logicalfile/LMI_UnixFileProvider.c | 4 | ||||
-rw-r--r-- | src/logicalfile/LMI_UnixSocketProvider.c | 6 | ||||
-rw-r--r-- | src/logicalfile/file.c | 2 | ||||
-rw-r--r-- | src/logicalfile/file.h | 10 |
12 files changed, 88 insertions, 88 deletions
diff --git a/src/logicalfile/LMI_DataFileProvider.c b/src/logicalfile/LMI_DataFileProvider.c index cef3219..c91da1e 100644 --- a/src/logicalfile/LMI_DataFileProvider.c +++ b/src/logicalfile/LMI_DataFileProvider.c @@ -65,12 +65,12 @@ static CMPIStatus LMI_DataFileGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); LMI_DataFile_InitFromObjectPath(&logicalfile.lf.datafile, _cb, cop); st = stat_logicalfile_and_fill(_cb, &logicalfile, S_IFREG, "Not a regular file: %s"); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); KReturnInstance(cr, logicalfile.lf.datafile); return st; diff --git a/src/logicalfile/LMI_DirectoryContainsFileProvider.c b/src/logicalfile/LMI_DirectoryContainsFileProvider.c index bcf6d14..8511bfa 100644 --- a/src/logicalfile/LMI_DirectoryContainsFileProvider.c +++ b/src/logicalfile/LMI_DirectoryContainsFileProvider.c @@ -51,17 +51,17 @@ static CMPIStatus logicalfile_objectpath_from_path( CMReturnWithChars(_cb, CMPI_RC_ERR_NOT_FOUND, err); } else { get_class_from_stat(&sb, fileclass); - st = lmi_check_assoc_class(_cb, namespace, resultClass, fileclass); + st = lmi_class_path_is_a(_cb, namespace, fileclass, resultClass); if (st.rc == LMI_RC_ERR_CLASS_CHECK_FAILED) { st.rc = CMPI_RC_OK; *o = NULL; return st; } /* check status again for other possible errors */ - lmi_check_status(st); + lmi_return_if_status_not_ok(st); st = get_fsinfo_from_stat(_cb, &sb, abspath, &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); } CIM_LogicalFileRef cim_lfr; @@ -107,7 +107,7 @@ static CMPIStatus dir_file_objectpaths( dirname = g_path_get_dirname(path); st = logicalfile_objectpath_from_path(dirname, resultClass, namespace, &o); g_free(dirname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); if (o) { ops[i++] = o; } @@ -160,8 +160,8 @@ static CMPIStatus associators( int group = -1; int rgroup = -1; - st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_DirectoryContainsFile_ClassName); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, LMI_DirectoryContainsFile_ClassName, assocClass); + lmi_return_if_class_check_not_ok(st); /* role && resultRole checks */ if (role) { if (strcmp(role, LMI_GROUP_COMPONENT) != 0 && strcmp(role, LMI_PART_COMPONENT) != 0) { @@ -189,7 +189,7 @@ static CMPIStatus associators( if (CMClassPathIsA(_cb, cop, LMI_UnixDirectory_ClassName, &st)) { /* got UnixDirectory - GroupComponent */ - st = lmi_check_required(_cb, cc, cop); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); if (st.rc != CMPI_RC_OK) { return st; } @@ -216,7 +216,7 @@ static CMPIStatus associators( } } else if (CMClassPathIsA(_cb, cop, CIM_LogicalFile_ClassName, &st)) { /* got LogicalFile - PartComponent */ - st = lmi_check_required(_cb, cc, cop); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); if (st.rc != CMPI_RC_OK) { return st; } @@ -226,8 +226,8 @@ static CMPIStatus associators( path = lmi_get_string_property_from_objectpath(cop, "Name"); if (!path) CMReturnWithChars(_cb, CMPI_RC_ERR_NOT_FOUND, "Cannot find Name property in provided CIM_logicalFile"); - st = lmi_check_assoc_class(_cb, ns, resultClass, LMI_UnixDirectory_ClassName); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, LMI_UnixDirectory_ClassName, resultClass); + lmi_return_if_class_check_not_ok(st); CIM_DirectoryRef lmi_dr; CIM_DirectoryRef_Init(&lmi_dr, _cb, ns); @@ -236,7 +236,7 @@ static CMPIStatus associators( char *fsclassname = NULL; st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); gchar *dirname = g_path_get_dirname(path); fill_logicalfile(CIM_DirectoryRef, &lmi_dr, dirname, fsclassname, fsname, LMI_UnixDirectory_ClassName); @@ -283,8 +283,8 @@ static CMPIStatus references( CMPIInstance *ci; int group = -1; - st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_DirectoryContainsFile_ClassName); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, LMI_DirectoryContainsFile_ClassName, assocClass); + lmi_return_if_class_check_not_ok(st); if (role) { if (strcmp(role, LMI_GROUP_COMPONENT) != 0 && strcmp(role, LMI_PART_COMPONENT) != 0) { CMReturn(CMPI_RC_OK); @@ -301,13 +301,13 @@ static CMPIStatus references( if (CMClassPathIsA(_cb, cop, LMI_UnixDirectory_ClassName, &st)) { - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); path = lmi_get_string_property_from_objectpath(cop, "Name"); if (!path) CMReturnWithChars(_cb, CMPI_RC_ERR_NOT_FOUND, "Cannot find Name property in provided LMI_UnixDirectory"); st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); /* got GroupComponent - DirectoryRef */ fill_logicalfile(CIM_DirectoryRef, &lmi_dr, path, fsclassname, fsname, LMI_UnixDirectory_ClassName); o = CIM_DirectoryRef_ToObjectPath(&lmi_dr, &st); @@ -318,7 +318,7 @@ static CMPIStatus references( CMPIObjectPath *refs[MAX_REFS]; unsigned int count = 0; st = dir_file_objectpaths(cc, cr, NULL, group, -1, properties, ns, path, refs, &count); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); if (count > MAX_REFS) { CMReturnWithChars(_cb, CMPI_RC_ERR_NOT_FOUND, "Too many files in a single directory..."); } @@ -335,14 +335,14 @@ static CMPIStatus references( } } } else if (CMClassPathIsA(_cb, cop, CIM_LogicalFile_ClassName, &st)) { - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); path = lmi_get_string_property_from_objectpath(cop, "Name"); if (!path) CMReturnWithChars(_cb, CMPI_RC_ERR_NOT_FOUND, "Cannot find Name property in provided CIM_LogicalFile"); get_class_from_path(path, ccname); st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); /* got PartComponent - LogicalFileRef */ if (group == 1) { CMReturn(CMPI_RC_OK); diff --git a/src/logicalfile/LMI_FIFOPipeFileProvider.c b/src/logicalfile/LMI_FIFOPipeFileProvider.c index 1330f56..59dc23d 100644 --- a/src/logicalfile/LMI_FIFOPipeFileProvider.c +++ b/src/logicalfile/LMI_FIFOPipeFileProvider.c @@ -65,12 +65,12 @@ static CMPIStatus LMI_FIFOPipeFileGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); LMI_FIFOPipeFile_InitFromObjectPath(&logicalfile.lf.fifopipefile, _cb, cop); st = stat_logicalfile_and_fill(_cb, &logicalfile, S_IFIFO, "No such FIFO: %s"); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); KReturnInstance(cr, logicalfile.lf.fifopipefile); return st; diff --git a/src/logicalfile/LMI_FileIdentityProvider.c b/src/logicalfile/LMI_FileIdentityProvider.c index b1a8599..7811895 100644 --- a/src/logicalfile/LMI_FileIdentityProvider.c +++ b/src/logicalfile/LMI_FileIdentityProvider.c @@ -48,21 +48,21 @@ static CMPIStatus associators( char *fsname = NULL; char *fsclassname = NULL; - st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_FileIdentity_ClassName); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, LMI_FileIdentity_ClassName, assocClass); + lmi_return_if_class_check_not_ok(st); if (CMClassPathIsA(_cb, cop, LMI_UnixFile_ClassName, &st)) { /* got UnixFile - SameElement */ - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); path = lmi_get_string_property_from_objectpath(cop, "LFName"); get_class_from_path(path, fileclass); st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); - st = lmi_check_assoc_class(_cb, ns, resultClass, fileclass); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, fileclass, resultClass); + lmi_return_if_class_check_not_ok(st); if (role && strcmp(role, LMI_SAME_ELEMENT) != 0) { CMReturn(CMPI_RC_OK); } @@ -77,13 +77,13 @@ static CMPIStatus associators( CMSetClassName(o, fileclass); } else if (CMClassPathIsA(_cb, cop, CIM_LogicalFile_ClassName, &st)) { /* got LogicalFile - SystemElement */ - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); path = lmi_get_string_property_from_objectpath(cop, "Name"); - st = lmi_check_assoc_class(_cb, ns, resultClass, LMI_UnixFile_ClassName); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, LMI_UnixFile_ClassName, resultClass); + lmi_return_if_class_check_not_ok(st); if (role && strcmp(role, LMI_SYSTEM_ELEMENT) != 0) { CMReturn(CMPI_RC_OK); } @@ -93,13 +93,13 @@ static CMPIStatus associators( get_class_from_path(path, fileclass); st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); LMI_UnixFile lmi_uf; LMI_UnixFile_Init(&lmi_uf, _cb, ns); LMI_UnixFile_Set_LFName(&lmi_uf, path); - LMI_UnixFile_Set_CSCreationClassName(&lmi_uf, get_system_creation_class_name()); - LMI_UnixFile_Set_CSName(&lmi_uf, get_system_name()); + LMI_UnixFile_Set_CSCreationClassName(&lmi_uf, lmi_get_system_creation_class_name()); + LMI_UnixFile_Set_CSName(&lmi_uf, lmi_get_system_name()); LMI_UnixFile_Set_FSCreationClassName(&lmi_uf, fsclassname); LMI_UnixFile_Set_FSName(&lmi_uf, fsname); LMI_UnixFile_Set_LFCreationClassName(&lmi_uf, fileclass); @@ -138,8 +138,8 @@ static CMPIStatus references( char *fsname = NULL; char *fsclassname = NULL; - st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_FileIdentity_ClassName); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, LMI_FileIdentity_ClassName, assocClass); + lmi_return_if_class_check_not_ok(st); LMI_FileIdentity_Init(&lmi_fi, _cb, ns); @@ -147,7 +147,7 @@ static CMPIStatus references( /* got UnixFile - SameElement */ LMI_FileIdentity_SetObjectPath_SameElement(&lmi_fi, cop); - st = lmi_check_required(_cb, cc, cop); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); if (st.rc != CMPI_RC_OK) { return st; } @@ -155,7 +155,7 @@ static CMPIStatus references( path = lmi_get_string_property_from_objectpath(cop, "LFName"); get_class_from_path(path, fileclass); st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); if (role && strcmp(role, LMI_SAME_ELEMENT) != 0) { CMReturn(CMPI_RC_OK); @@ -173,7 +173,7 @@ static CMPIStatus references( /* got LogicalFile - SystemElement */ LMI_FileIdentity_SetObjectPath_SystemElement(&lmi_fi, cop); - st = lmi_check_required(_cb, cc, cop); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); if (st.rc != CMPI_RC_OK) { return st; } @@ -184,14 +184,14 @@ static CMPIStatus references( path = lmi_get_string_property_from_objectpath(cop, "Name"); get_class_from_path(path, fileclass); st = get_fsinfo_from_path(_cb, path, &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); /* SameElement */ LMI_UnixFile lmi_uf; LMI_UnixFile_Init(&lmi_uf, _cb, ns); LMI_UnixFile_Set_LFName(&lmi_uf, path); - LMI_UnixFile_Set_CSCreationClassName(&lmi_uf, get_system_creation_class_name()); - LMI_UnixFile_Set_CSName(&lmi_uf, get_system_name()); + LMI_UnixFile_Set_CSCreationClassName(&lmi_uf, lmi_get_system_creation_class_name()); + LMI_UnixFile_Set_CSName(&lmi_uf, lmi_get_system_name()); LMI_UnixFile_Set_FSCreationClassName(&lmi_uf, fsclassname); LMI_UnixFile_Set_FSName(&lmi_uf, fsname); LMI_UnixFile_Set_LFCreationClassName(&lmi_uf, fileclass); diff --git a/src/logicalfile/LMI_RootDirectoryProvider.c b/src/logicalfile/LMI_RootDirectoryProvider.c index 4ada3f5..501638f 100644 --- a/src/logicalfile/LMI_RootDirectoryProvider.c +++ b/src/logicalfile/LMI_RootDirectoryProvider.c @@ -40,22 +40,22 @@ static CMPIStatus associators( CMPIInstance *ci; CMPIStatus st; const char *ns = KNameSpace(cop); - const char *comp_ccname = get_system_creation_class_name(); + const char *comp_ccname = lmi_get_system_creation_class_name(); const char *path = lmi_get_string_property_from_objectpath(cop, "Name"); char *fsname = NULL; char *fsclassname = NULL; const char *systemname = lmi_get_system_creation_class_name(); - st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_RootDirectory_ClassName); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, LMI_RootDirectory_ClassName, assocClass); + lmi_return_if_class_check_not_ok(st); st = get_fsinfo_from_path(_cb, "/", &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); if (CMClassPathIsA(_cb, cop, LMI_UnixDirectory_ClassName, &st)) { /* got LMI_UnixDirectory - PartComponent */ - st = lmi_check_assoc_class(_cb, ns, resultClass, comp_ccname); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, comp_ccname, resultClass); + lmi_return_if_class_check_not_ok(st); if (role && strcmp(role, LMI_PART_COMPONENT) != 0) { CMReturn(CMPI_RC_OK); } @@ -75,8 +75,8 @@ static CMPIStatus associators( } } else if (CMClassPathIsA(_cb, cop, systemname, &st)) { /* got CIM_ComputerSystem - GroupComponent */ - st = lmi_check_assoc_class(_cb, ns, resultClass, LMI_UnixDirectory_ClassName); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, LMI_UnixDirectory_ClassName, resultClass); + lmi_return_if_class_check_not_ok(st); if (role && strcmp(role, LMI_GROUP_COMPONENT) != 0) { CMReturn(CMPI_RC_OK); } @@ -122,13 +122,13 @@ static CMPIStatus references( get_class_from_path(path, ccname); const char *systemname = lmi_get_system_creation_class_name(); - st = lmi_check_assoc_class(_cb, ns, assocClass, LMI_RootDirectory_ClassName); - lmi_check_class_check_status(st); + st = lmi_class_path_is_a(_cb, ns, LMI_RootDirectory_ClassName, assocClass); + lmi_return_if_class_check_not_ok(st); char *fsname = NULL; char *fsclassname = NULL; st = get_fsinfo_from_path(_cb, "/", &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); LMI_RootDirectory_Init(&lmi_rd, _cb, ns); @@ -141,8 +141,8 @@ static CMPIStatus references( if (strcmp(path, "/") != 0) { CMReturn(CMPI_RC_OK); } - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); LMI_RootDirectory_SetObjectPath_PartComponent(&lmi_rd, cop); LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd, @@ -218,7 +218,7 @@ static CMPIStatus LMI_RootDirectoryEnumInstances( LMI_UnixDirectory lmi_ud; LMI_UnixDirectory_Init(&lmi_ud, _cb, ns); st = get_fsinfo_from_path(_cb, "/", &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); fill_logicalfile(LMI_UnixDirectory, &lmi_ud, "/", fsclassname, fsname, LMI_UnixDirectory_ClassName); o = LMI_UnixDirectory_ToObjectPath(&lmi_ud, NULL); LMI_RootDirectory_SetObjectPath_PartComponent(&lmi_rd, o); diff --git a/src/logicalfile/LMI_SymbolicLinkProvider.c b/src/logicalfile/LMI_SymbolicLinkProvider.c index 68a6142..362291a 100644 --- a/src/logicalfile/LMI_SymbolicLinkProvider.c +++ b/src/logicalfile/LMI_SymbolicLinkProvider.c @@ -65,12 +65,12 @@ static CMPIStatus LMI_SymbolicLinkGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); LMI_SymbolicLink_InitFromObjectPath(&logicalfile.lf.symboliclink, _cb, cop); st = stat_logicalfile_and_fill(_cb, &logicalfile, S_IFLNK, "No such symlink: %s"); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); KReturnInstance(cr, logicalfile.lf.symboliclink); return st; @@ -85,9 +85,9 @@ static CMPIStatus LMI_SymbolicLinkCreateInstance( { CMPIStatus st = {.rc = CMPI_RC_OK}; CMPIObjectPath *iop = CMGetObjectPath(ci, &st); - lmi_check_status(st); - st = lmi_check_required(_cb, cc, iop); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); + st = lmi_check_required_properties(_cb, cc, iop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); const char *path = lmi_get_string_property_from_instance(ci, "Name"); const char *target = lmi_get_string_property_from_instance(ci, "TargetFile"); diff --git a/src/logicalfile/LMI_UnixDeviceFileProvider.c b/src/logicalfile/LMI_UnixDeviceFileProvider.c index 3062094..07ac033 100644 --- a/src/logicalfile/LMI_UnixDeviceFileProvider.c +++ b/src/logicalfile/LMI_UnixDeviceFileProvider.c @@ -65,12 +65,12 @@ static CMPIStatus LMI_UnixDeviceFileGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); LMI_UnixDeviceFile_InitFromObjectPath(&logicalfile.lf.unixdevicefile, _cb, cop); st = stat_logicalfile_and_fill(_cb, &logicalfile, S_IFCHR | S_IFBLK, "No such device: %s"); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); KReturnInstance(cr, logicalfile.lf.unixdevicefile); return st; diff --git a/src/logicalfile/LMI_UnixDirectoryProvider.c b/src/logicalfile/LMI_UnixDirectoryProvider.c index 1ca995b..8cb18a5 100644 --- a/src/logicalfile/LMI_UnixDirectoryProvider.c +++ b/src/logicalfile/LMI_UnixDirectoryProvider.c @@ -65,12 +65,12 @@ static CMPIStatus LMI_UnixDirectoryGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); LMI_UnixDirectory_InitFromObjectPath(&logicalfile.lf.unixdirectory, _cb, cop); st = stat_logicalfile_and_fill(_cb, &logicalfile, S_IFDIR, "Not a directory: %s"); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); KReturnInstance(cr, logicalfile.lf.unixdirectory); return st; @@ -85,9 +85,9 @@ static CMPIStatus LMI_UnixDirectoryCreateInstance( { CMPIStatus st; CMPIObjectPath *iop = CMGetObjectPath(ci, &st); - lmi_check_status(st); - st = lmi_check_required(_cb, cc, iop); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); + st = lmi_check_required_properties(_cb, cc, iop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); const char *path = lmi_get_string_property_from_objectpath(iop, "Name"); bool allow = lmi_read_config_boolean("LMI_UnixDirectory", "AllowMkdir"); diff --git a/src/logicalfile/LMI_UnixFileProvider.c b/src/logicalfile/LMI_UnixFileProvider.c index 52e7b9c..0a92751 100644 --- a/src/logicalfile/LMI_UnixFileProvider.c +++ b/src/logicalfile/LMI_UnixFileProvider.c @@ -122,7 +122,7 @@ static CMPIStatus LMI_UnixFileGetInstance( char *fsname; char *fsclassname; - st = lmi_check_required(_cb, cc, cop); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); if (st.rc != CMPI_RC_OK) { return st; } @@ -140,7 +140,7 @@ static CMPIStatus LMI_UnixFileGetInstance( fsname = (char *) KChars(lmi_file.FSName.value); fsclassname = (char *) KChars(lmi_file.FSCreationClassName.value); st = get_fsinfo_from_stat(_cb, &sb, path, &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); LMI_UnixFile_Set_FSCreationClassName(&lmi_file, fsclassname); LMI_UnixFile_Set_FSName(&lmi_file, fsname); get_class_from_stat(&sb, aux); diff --git a/src/logicalfile/LMI_UnixSocketProvider.c b/src/logicalfile/LMI_UnixSocketProvider.c index d19753c..24a1225 100644 --- a/src/logicalfile/LMI_UnixSocketProvider.c +++ b/src/logicalfile/LMI_UnixSocketProvider.c @@ -65,12 +65,12 @@ static CMPIStatus LMI_UnixSocketGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cc, cop); - lmi_check_status(st); + st = lmi_check_required_properties(_cb, cc, cop, "CSCreationClassName", "CSName"); + lmi_return_if_status_not_ok(st); LMI_UnixSocket_InitFromObjectPath(&logicalfile.lf.unixsocket, _cb, cop); st = stat_logicalfile_and_fill(_cb, &logicalfile, S_IFSOCK, "No such socket: %s"); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); KReturnInstance(cr, logicalfile.lf.unixsocket); return st; diff --git a/src/logicalfile/file.c b/src/logicalfile/file.c index 03c99da..28ef7fe 100644 --- a/src/logicalfile/file.c +++ b/src/logicalfile/file.c @@ -141,7 +141,7 @@ CMPIStatus stat_logicalfile_and_fill( fsname = (char *) KChars(lf->lf.datafile.FSName.value); fsclassname = (char *) KChars(lf->lf.datafile.FSCreationClassName.value); st = get_fsinfo_from_stat(b, &sb, path, &fsclassname, &fsname); - lmi_check_status(st); + lmi_return_if_status_not_ok(st); switch(mode) { case S_IFREG: diff --git a/src/logicalfile/file.h b/src/logicalfile/file.h index a5291ed..518cc77 100644 --- a/src/logicalfile/file.h +++ b/src/logicalfile/file.h @@ -59,11 +59,11 @@ const char *provider_name; ) #define fill_logicalfile(type, obj, name, fsclassname, fsname, creation_class) \ - type##_Set_Name((obj), (name)); \ - type##_Set_CSCreationClassName((obj), get_system_creation_class_name()); \ - type##_Set_CSName((obj), get_system_name()); \ - type##_Set_FSCreationClassName((obj), fsclassname); \ - type##_Set_FSName((obj), (fsname)); \ + type##_Set_Name((obj), (name)); \ + type##_Set_CSCreationClassName((obj), lmi_get_system_creation_class_name()); \ + type##_Set_CSName((obj), lmi_get_system_name()); \ + type##_Set_FSCreationClassName((obj), fsclassname); \ + type##_Set_FSName((obj), (fsname)); \ type##_Set_CreationClassName((obj), (creation_class)); #define fill_basic(b, cmpitype, lmi_file, creation_class_name, fsclassname, fsname, sb) \ |