Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwsetup-ng.git;a=commitdiff;h=7397d49bb44083adf513a931f1ac06a4c9694878
commit 7397d49bb44083adf513a931f1ac06a4c9694878 Author: James Buren <[email protected]> Date: Tue Aug 14 17:45:24 2012 -0500 rename some functions to be easier to read diff --git a/fwsetup.h b/fwsetup.h index 4a09522..53f0fd7 100644 --- a/fwsetup.h +++ b/fwsetup.h @@ -25,7 +25,7 @@ #define DM_MAJOR 254 #define LOGFILE "fwsetup.log" #define LOG_ERRNO() eprintf("%s: %s\n",__func__,strerror(errno)) -#define ASSERT_ARGS(B,R) if(B) { errno = EINVAL; LOG_ERRNO(); return R; } +#define ASSERT_ARGS(B,R) if(B) { errno = EINVAL; LOG_ERRNO(); return R; } #define EXECUTE_START_TEXT _("About to execute command '%s'.\n") #define EXECUTE_STOP_TEXT _("Successfully executed command '%s'.\n") #define PROCESS_EXIT_ERROR_TEXT _("A process (%d) has exitted with a non-zero exit code (%d).\n") @@ -124,11 +124,11 @@ extern void *list_append(void *list,size_t n); extern void *list_find_start(void *list); extern void *list_find_end(void *list); extern void list_free(void *list,void (*cb) (void *)); -extern void free_string(void *p); -extern void free_partition(void *p); -extern struct device *read_device_data(const char *path); -extern bool write_device_data(const struct device *device); -extern void free_device(struct device *device); +extern void string_free(void *p); +extern void partition_free(void *p); +extern struct device *device_read_data(const char *path); +extern bool device_write_data(const struct device *device); +extern void device_free(struct device *device); extern int main(void); extern struct module begin_module; extern struct module partition_setup_module; diff --git a/utility.c b/utility.c index bec2e68..8124993 100644 --- a/utility.c +++ b/utility.c @@ -124,7 +124,7 @@ extern void *malloc0(size_t n) extern pid_t execute(const char *cmd) { ASSERT_ARGS(cmd == 0,-1); - + pid_t pid = -1; int fd = -1; @@ -265,7 +265,7 @@ extern void list_free(void *list,void (*cb) (void *)) } } -extern void free_string(void *p) +extern void string_free(void *p) { if(p == 0) return; @@ -277,7 +277,7 @@ extern void free_string(void *p) free(string); } -extern void free_partition(void *p) +extern void partition_free(void *p) { if(p == 0) return; @@ -293,7 +293,7 @@ extern void free_partition(void *p) free(partition); } -extern struct device *read_device_data(const char *path) +extern struct device *device_read_data(const char *path) { ASSERT_ARGS(path == 0,0); @@ -360,8 +360,8 @@ extern struct device *read_device_data(const char *path) type = DEVICETYPE_VIRTIO; else if(is_mdadm_device(&st)) type = DEVICETYPE_MDADM; - else - goto bail; +// else +// goto bail; partlist = blkid_probe_get_partitions(probe); @@ -480,7 +480,7 @@ bail: return device; } -extern bool write_device_data(const struct device *device) +extern bool device_write_data(const struct device *device) { ASSERT_ARGS(device == 0 || device->label == 0 || device->partitions == 0,false); @@ -555,12 +555,12 @@ extern bool write_device_data(const struct device *device) return true; } -extern void free_device(struct device *device) +extern void device_free(struct device *device) { if(device == 0) return; - list_free(device->partitions,free_partition); + list_free(device->partitions,partition_free); free(device->uuid); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
