Re: [Xen-devel] [PATCH v3 09/12] xenstore: make functions static

[Juergen Gross <jgross@xxxxxxxx>]

On 11/11/16 14:02, Andrew Cooper wrote:
> On 11/11/16 08:00, Juergen Gross wrote:
>> Move functions used in only one source to the file where they are used
>> and make them static.
>>
>> Remove some prototypes from headers which are no longer in use.
>>
>> Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
>> ---
>>  tools/xenstore/include/xenstore_lib.h |  15 -----
>>  tools/xenstore/xenstore_client.c      | 117 
>> ++++++++++++++++++++++++++++++++++
>>  tools/xenstore/xenstored_core.c       |  55 +++++-----------
>>  tools/xenstore/xenstored_core.h       |  14 ----
>>  tools/xenstore/xenstored_watch.c      |  27 ++++++++
>>  tools/xenstore/xenstored_watch.h      |   2 -
>>  tools/xenstore/xs_lib.c               | 112 --------------------------------
>>  7 files changed, 159 insertions(+), 183 deletions(-)
>>
>> diff --git a/tools/xenstore/include/xenstore_lib.h 
>> b/tools/xenstore/include/xenstore_lib.h
>> index 0ffbae9..866261d 100644
>> --- a/tools/xenstore/include/xenstore_lib.h
>> +++ b/tools/xenstore/include/xenstore_lib.h
>> @@ -76,19 +76,4 @@ bool xs_perm_to_string(const struct xs_permissions *perm,
>>  /* Given a string and a length, count how many strings (nul terms). */
>>  unsigned int xs_count_strings(const char *strings, unsigned int len);
>>  
>> -/* Sanitising (quoting) possibly-binary strings. */
>> -struct expanding_buffer {
>> -    char *buf;
>> -    int avail;
>> -};
>> -
>> -/* Ensure that given expanding buffer has at least min_avail characters. */
>> -char *expanding_buffer_ensure(struct expanding_buffer *, int min_avail);
>> -
>> -/* sanitise_value() may return NULL if malloc fails. */
>> -char *sanitise_value(struct expanding_buffer *, const char *val, unsigned 
>> len);
>> -
>> -/* *out_len_r on entry is ignored; out must be at least strlen(in)+1 bytes. 
>> */
>> -void unsanitise_value(char *out, unsigned *out_len_r, const char *in);
>> -
>>  #endif /* XENSTORE_LIB_H */
> 
> This is a public header file for a shared object.  You can't remove
> functionality like this.

Oops, my bad. I stopped reading the Makefile at the xenstored runes
telling me xs_lib.o to be linked into xenstored. I assumed the same to
be true for xenstore_client. So I think I'll modify the patch to avoid
including the not needed parts of xs_lib.c in xenstored.


Juergen

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel