--- pbx_limit.c	2006-08-26 20:59:38 +0400
+++ pbx_limit.c.v2	2006-08-26 21:10:02 +0400
@@ -25,9 +25,6 @@
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
 
-
-static char *tdesc = "Resource limits";
-
 static struct limits {
 	int resource;
 	char limit[3];
@@ -47,7 +44,7 @@
 
 static int str2limit(const char *string)
 {
-	int i;
+	size_t i;
 	for (i = 0; i < sizeof(limits) / sizeof(limits[0]); i++) {
 		if (!strcasecmp(string, limits[i].limit))
 			return limits[i].resource;
@@ -57,7 +54,7 @@
 
 static const char *str2desc(const char *string)
 {
-	int i;
+	size_t i;
 	for (i = 0; i < sizeof(limits) / sizeof(limits[0]); i++) {
 		if (!strcmp(string, limits[i].limit))
 			return limits[i].desc;
@@ -68,7 +65,7 @@
 static int my_ulimit(int fd, int argc, char **argv)
 {
 	int resource;
-	struct rlimit rlimit = { 0, };
+	struct rlimit rlimit = { 0, 0 };
 	if (argc < 2 || argc > 3)
 		return RESULT_SHOWUSAGE;
 
@@ -92,7 +89,7 @@
 		if (!getrlimit(resource, &rlimit)) {
 			char printlimit[32];
 			const char *desc;
-			if (rlimit.rlim_max == -1)
+			if (rlimit.rlim_max == RLIM_INFINITY)
 				ast_copy_string(printlimit, "effectively unlimited.", sizeof(printlimit));
 			else
 				snprintf(printlimit, sizeof(printlimit), "%d/%d", (int)rlimit.rlim_cur, (int)rlimit.rlim_max);
@@ -122,25 +119,15 @@
 	{ "ulimit", NULL }, my_ulimit,
 	"Set or show process resource limits", ulimit_usage, NULL };
 
-static int unload_module(void *mod)
+static int unload_module(void)
 {
 	return ast_cli_unregister(&cli_ulimit);
 }
 
-static int load_module(void *mod)
-{
-	return ast_cli_register(&cli_ulimit);
-}
-
-static const char *description(void)
-{
-	return tdesc;
-}
-
-static const char *key(void)
+static int load_module(void)
 {
-	return ASTERISK_GPL_KEY;
+	return ast_cli_register(&cli_ulimit)? AST_MODULE_LOAD_FAILURE: AST_MODULE_LOAD_SUCCESS;
 }
 
-STD_MOD(MOD_1, NULL, NULL, NULL);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Resource limits");