From a7d2f9a08ed11dba157d6fe5c03581114478e3d3 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Fri, 24 Jan 2014 16:45:31 +1300 Subject: param: change s3_param.h from a generated file to a static one Signed-off-by: Garming Sam Change-Id: I131e37ec92f7a826caec382023915c5e4b4c52be Reviewed-by: Andrew Bartlett Reviewed-by: Nadezhda Ivanova --- script/generate_param.py | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'script/generate_param.py') diff --git a/script/generate_param.py b/script/generate_param.py index 8bd2e2b48ba..d79c13c7275 100644 --- a/script/generate_param.py +++ b/script/generate_param.py @@ -35,8 +35,8 @@ parser.add_option("-f", "--file", dest="filename", help="input file", metavar="FILE") parser.add_option("-o", "--output", dest="output", help='output file', metavar="FILE") -parser.add_option("--mode", type="choice", metavar="", - choices=["FUNCTIONS", "S3PROTO", "LIBPROTO", "PARAMDEFS", "S3PARAM"], default="FUNCTIONS") +parser.add_option("--mode", type="choice", metavar="", + choices=["FUNCTIONS", "S3PROTO", "LIBPROTO", "PARAMDEFS"], default="FUNCTIONS") parser.add_option("--scope", metavar="", choices = ["GLOBAL", "LOCAL"], default="GLOBAL") @@ -258,33 +258,6 @@ def make_param_defs(path_in, path_out, scope): finally: file_out.close() -def make_s3_param(path_in, path_out): - file_out = open(path_out, 'w') - try: - file_out.write('/* This file was automatically generated by generate_param.py. DO NOT EDIT */\n\n') - header = get_header(path_out) - file_out.write("#ifndef %s\n" % header) - file_out.write("#define %s\n\n" % header) - file_out.write("struct loadparm_s3_helpers\n") - file_out.write("{\n") - file_out.write("\tconst char * (*get_parametric)(struct loadparm_service *, const char *type, const char *option);\n") - file_out.write("\tstruct parm_struct * (*get_parm_struct)(const char *param_name);\n") - file_out.write("\tvoid * (*get_parm_ptr)(struct loadparm_service *service, struct parm_struct *parm);\n") - file_out.write("\tstruct loadparm_service * (*get_service)(const char *service_name);\n") - file_out.write("\tstruct loadparm_service * (*get_default_loadparm_service)(void);\n") - file_out.write("\tstruct loadparm_service * (*get_servicebynum)(int snum);\n") - file_out.write("\tint (*get_numservices)(void);\n") - file_out.write("\tbool (*load)(const char *filename);\n") - file_out.write("\tbool (*set_cmdline)(const char *pszParmName, const char *pszParmValue);\n") - file_out.write("\tvoid (*dump)(FILE *f, bool show_defaults, int maxtoprint);\n") - file_out.write("\tconst char * (*dnsdomain)(void);\n") - file_out.write("\tchar * (*lp_string)(TALLOC_CTX *ctx, const char *in);\n") - file_out.write("\tstruct loadparm_global *globals;\n") - file_out.write("};\n") - file_out.write("\n#endif /* %s */\n\n" % header) - finally: - file_out.close() - if options.mode == 'FUNCTIONS': generate_functions(options.filename, options.output) elif options.mode == 'S3PROTO': @@ -293,5 +266,3 @@ elif options.mode == 'LIBPROTO': make_lib_proto(options.filename, options.output) elif options.mode == 'PARAMDEFS': make_param_defs(options.filename, options.output, options.scope) -elif options.mode == 'S3PARAM': - make_s3_param(options.filename, options.output) -- cgit