flickcurl.h   flickcurl.h 
skipping to change at line 68 skipping to change at line 68
VALUE_TYPE_NONE, /* empty field */ VALUE_TYPE_NONE, /* empty field */
VALUE_TYPE_PHOTO_ID, /* internal */ VALUE_TYPE_PHOTO_ID, /* internal */
VALUE_TYPE_PHOTO_URI, /* internal */ VALUE_TYPE_PHOTO_URI, /* internal */
VALUE_TYPE_UNIXTIME, VALUE_TYPE_UNIXTIME,
VALUE_TYPE_BOOLEAN, VALUE_TYPE_BOOLEAN,
VALUE_TYPE_DATETIME, VALUE_TYPE_DATETIME,
VALUE_TYPE_FLOAT, VALUE_TYPE_FLOAT,
VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER,
VALUE_TYPE_STRING, VALUE_TYPE_STRING,
VALUE_TYPE_URI, VALUE_TYPE_URI,
VALUE_TYPE_LAST = VALUE_TYPE_URI VALUE_TYPE_PERSON_ID, /* internal */
VALUE_TYPE_LAST = VALUE_TYPE_PERSON_ID
} flickcurl_field_value_type; } flickcurl_field_value_type;
typedef struct flickcurl_s flickcurl; typedef struct flickcurl_s flickcurl;
struct flickcurl_photo_s; struct flickcurl_photo_s;
typedef struct flickcurl_tag_s typedef struct flickcurl_tag_s {
{
struct flickcurl_photo_s* photo; struct flickcurl_photo_s* photo;
char* id; char* id;
char* author; char* author;
char* raw; char* raw;
char* cooked; char* cooked;
int machine_tag; int machine_tag;
} flickcurl_tag; } flickcurl_tag;
typedef struct flickcurl_photo_s typedef struct flickcurl_photo_s {
{
/* photo id */ /* photo id */
char *id; char *id;
/* photo page uri */ /* photo page uri */
char *uri; char *uri;
flickcurl_tag* tags[20]; flickcurl_tag* tags[20];
int tags_count; int tags_count;
struct { struct {
char* string; char* string;
int integer; int integer;
flickcurl_field_value_type type; flickcurl_field_value_type type;
} fields[PHOTO_FIELD_LAST + 1]; } fields[PHOTO_FIELD_LAST + 1];
} flickcurl_photo; } flickcurl_photo;
typedef struct {
/* license id */
int id;
/* license url or NULL if none */
char *url;
/* license name */
char *name;
} flickcurl_license;
typedef enum {
PERSON_FIELD_none,
PERSON_FIELD_isadmin, /* boolean */
PERSON_FIELD_ispro, /* boolean */
PERSON_FIELD_iconserver, /* integer */
PERSON_FIELD_iconfarm, /* integer - not in API docs */
PERSON_FIELD_username, /* string */
PERSON_FIELD_realname, /* string */
PERSON_FIELD_mbox_sha1sum, /* string */
PERSON_FIELD_location, /* string */
PERSON_FIELD_photosurl, /* string */
PERSON_FIELD_profileurl, /* string */
PERSON_FIELD_mobileurl, /* string - not in API docs */
PERSON_FIELD_photos_firstdate, /* dateTime */
PERSON_FIELD_photos_firstdatetaken, /* dateTime */
PERSON_FIELD_photos_count, /* integer */
PERSON_FIELD_LAST = PERSON_FIELD_photos_count
} flickcurl_person_field;
typedef struct {
/* user nsid */
char *nsid;
struct {
char* string;
int integer;
flickcurl_field_value_type type;
} fields[PERSON_FIELD_LAST + 1];
} flickcurl_person;
typedef void (*flickcurl_message_handler)(void *user_data, const char *mess age); typedef void (*flickcurl_message_handler)(void *user_data, const char *mess age);
typedef void (*set_config_var_handler)(void* userdata, const char* key, con st char* value); typedef void (*set_config_var_handler)(void* userdata, const char* key, con st char* value);
typedef void (*flickcurl_tag_handler)(void *user_data, flickcurl_tag* tag); typedef void (*flickcurl_tag_handler)(void *user_data, flickcurl_tag* tag);
extern const char* const flickcurl_short_copyright_string; extern const char* const flickcurl_short_copyright_string;
extern const char* const flickcurl_copyright_string; extern const char* const flickcurl_copyright_string;
extern const char* const flickcurl_license_string; extern const char* const flickcurl_license_string;
extern const char* const flickcurl_home_url_string; extern const char* const flickcurl_home_url_string;
skipping to change at line 139 skipping to change at line 177
void flickcurl_set_shared_secret(flickcurl* fc, const char *secret); void flickcurl_set_shared_secret(flickcurl* fc, const char *secret);
void flickcurl_set_auth_token(flickcurl *fc, const char* auth_token); void flickcurl_set_auth_token(flickcurl *fc, const char* auth_token);
void flickcurl_set_sig_key(flickcurl *fc, const char* sig_key); void flickcurl_set_sig_key(flickcurl *fc, const char* sig_key);
/* get methods */ /* get methods */
const char* flickcurl_get_api_key(flickcurl *fc); const char* flickcurl_get_api_key(flickcurl *fc);
const char* flickcurl_get_shared_secret(flickcurl *fc); const char* flickcurl_get_shared_secret(flickcurl *fc);
const char* flickcurl_get_auth_token(flickcurl *fc); const char* flickcurl_get_auth_token(flickcurl *fc);
const char* flickcurl_get_photo_field_label(flickcurl_photo_field field); const char* flickcurl_get_photo_field_label(flickcurl_photo_field field);
const char* flickcurl_get_person_field_label(flickcurl_person_field field);
const char* flickcurl_get_field_value_type_label(flickcurl_field_value_type datatype); const char* flickcurl_get_field_value_type_label(flickcurl_field_value_type datatype);
/* utility methods */ /* utility methods */
char* flickcurl_photo_as_source_uri(flickcurl_photo *photo, const char c); char* flickcurl_photo_as_source_uri(flickcurl_photo *photo, const char c);
/* Flickr API calls */ /* Flickr API calls */
char* flickcurl_auth_getFullToken(flickcurl* fc, const char* frob); char* flickcurl_auth_getFullToken(flickcurl* fc, const char* frob);
flickcurl_person* flickcurl_people_getInfo(flickcurl* fc, const char* user_
id);
flickcurl_photo* flickcurl_photos_getInfo(flickcurl *fc, const char* photo_ id); flickcurl_photo* flickcurl_photos_getInfo(flickcurl *fc, const char* photo_ id);
flickcurl_license** flickcurl_photos_licenses_getInfo(flickcurl *fc);
flickcurl_license* flickcurl_photos_licenses_getInfo_by_id(flickcurl *fc, i
nt id);
int flickcurl_test_echo(flickcurl* fc, const char* key, const char* value); int flickcurl_test_echo(flickcurl* fc, const char* key, const char* value);
char* flickcurl_urls_lookupUser(flickcurl* fc, const char* url);
void flickcurl_free_tag(flickcurl_tag *t); void flickcurl_free_tag(flickcurl_tag *t);
void flickcurl_free_photo(flickcurl_photo *photo); void flickcurl_free_photo(flickcurl_photo *photo);
/* void flickcurl_free_license(flickcurl_person *license); */
void flickcurl_free_person(flickcurl_person *person);
/* config.c */ /* config.c */
int read_ini_config(const char* filename, const char* application, void* us er_data, set_config_var_handler handler); int read_ini_config(const char* filename, const char* application, void* us er_data, set_config_var_handler handler);
 End of changes. 9 change blocks. 
5 lines changed or deleted 55 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/